diff --git a/modules/utilities/unix/desktop/xfce/manifests/install.pp b/modules/utilities/unix/desktop/xfce/manifests/install.pp
index 61a6f4353..7448404f6 100644
--- a/modules/utilities/unix/desktop/xfce/manifests/install.pp
+++ b/modules/utilities/unix/desktop/xfce/manifests/install.pp
@@ -1,11 +1,5 @@
 class xfce::install{
-
   package { ['xfce4','lightdm']:
     ensure => 'installed',
   }
-
-  exec { 'lightdm-autologin-root':
-    require => Package['lightdm'],
-    command => "/bin/sed -i \'/\\[SeatDefaults\\]/a autologin-user=root\' /etc/lightdm/lightdm.conf"
-  }
 }
diff --git a/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/manifests/configure.pp b/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/manifests/configure.pp
new file mode 100644
index 000000000..0fde35705
--- /dev/null
+++ b/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/manifests/configure.pp
@@ -0,0 +1,5 @@
+class xfce_lightdm_root_login::configure {
+  exec { 'lightdm-autologin-root':
+    command => "/bin/sed -i \'/\\[SeatDefaults\\]/a autologin-user=root\' /etc/lightdm/lightdm.conf"
+  }
+}
diff --git a/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/secgen_metadata.xml b/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/secgen_metadata.xml
new file mode 100644
index 000000000..38c7d611d
--- /dev/null
+++ b/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/secgen_metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<vulnerability xmlns="http://www.github/cliffe/SecGen/vulnerability"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://www.github/cliffe/SecGen/vulnerability">
+  <name>XFCE w/ LightDM Root Login</name>
+  <author>Thomas Shaw</author>
+  <module_license>MIT</module_license>
+  <description>Configures XFCE w/ LightDM to automatically login as root without a password.</description>
+
+  <type>desktop_environment</type>
+  <privilege>root_rwx</privilege>
+  <access>local</access>
+  <platform>linux</platform>
+
+  <requires>
+    <type>update</type>
+  </requires>
+  <requires>
+    <module_path>modules/utilities/unix/desktop/xfce</module_path>
+  </requires>
+</vulnerability>
diff --git a/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/xfce_lightdm_root_login.pp b/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/xfce_lightdm_root_login.pp
new file mode 100644
index 000000000..654f73836
--- /dev/null
+++ b/modules/vulnerabilities/unix/desktop/xfce_lightdm_root_login/xfce_lightdm_root_login.pp
@@ -0,0 +1 @@
+include xfce_lightdm_root_login::configure
diff --git a/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml b/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
new file mode 100644
index 000000000..95af0365e
--- /dev/null
+++ b/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<scenario xmlns="http://www.github/cliffe/SecGen/scenario"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
+
+  <system>
+    <system_name>xfce_lightdm_root_login</system_name>
+    <base platform="linux"/>
+
+    <vulnerability module_path=".*xfce_lightdm_root_login"/>
+
+    <network type="private_network" range="dhcp"/>
+  </system>
+
+</scenario>
diff --git a/scenarios/security_audit/team_project_scenario.xml b/scenarios/security_audit/team_project_scenario.xml
index 41c9bef1f..023d249ef 100644
--- a/scenarios/security_audit/team_project_scenario.xml
+++ b/scenarios/security_audit/team_project_scenario.xml
@@ -264,7 +264,7 @@
   <system>
     <system_name>desktop</system_name>
     <base platform="linux"/>
-    <utility module_path=".*xfce"/>
+    <vulnerability module_path=".*xfce_lightdm_root_login"/>
     <utility module_path=".*iceweasel" />
     <network module_path=".*private_network_2"/>
   </system>