diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 310344c..94b74ca 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -18,7 +18,8 @@ class stage4(StageBase):
 			"stage4/root_overlay","stage4/fsscript",\
 			"stage4/gk_mainargs","splash_theme",\
 			"portage_overlay","stage4/rcadd","stage4/rcdel",\
-			"stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"])
+			"stage4/linuxrc","stage4/unmerge","stage4/rm",\
+                        "stage4/empty","stage4/users"])
 		StageBase.__init__(self,spec,addlargs)
 
 	def set_cleanables(self):
@@ -30,7 +31,7 @@ class stage4(StageBase):
 			"bind","chroot_setup","setup_environment","build_packages",\
 			"build_kernel","bootloader","root_overlay","fsscript",\
 			"preclean","rcupdate","unmerge","unbind","remove","empty",\
-			"clean"]
+			"clean","users"]
 
 #		if "TARBALL" in self.settings or \
 #			"fetch" not in self.settings['options']:
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index d42f302..2efab22 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -53,6 +53,7 @@ case $1 in
 	;;
 
 	livecd-update)
+		export clst_livecd_users="${clst_stage4_users}"
 		# Now, finalize and tweak the livecd fs (inside of the chroot)
 		exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh