diff --git a/ts/build/packages/base/etc/thinstation.exports b/ts/build/packages/base/etc/thinstation.exports
index 1bc55eb76..1059f9d1b 100644
--- a/ts/build/packages/base/etc/thinstation.exports
+++ b/ts/build/packages/base/etc/thinstation.exports
@@ -15,7 +15,6 @@ DEVICE
 DISPLAY
 FILESYSTEMS
 HALTONERROR
-HOME
 ICONMODE
 KEYBOARD_MAP
 LANG
diff --git a/ts/build/packages/installer/bin/installer b/ts/build/packages/installer/bin/installer
index 7588c1943..5d44571e4 100755
--- a/ts/build/packages/installer/bin/installer
+++ b/ts/build/packages/installer/bin/installer
@@ -453,7 +453,8 @@ cred_dialog()
 	'
 set +x
 		result=`$GTKDIALOG`
-		for statement in `echo $result`;do
+		IFS=$'\n'
+		for statement in $result;do
 			eval $statement
 		done
 		if [ "$EXIT" != "ok" ]; then
@@ -469,6 +470,7 @@ set +x
 			x_echo "Error" "All fields are required. Please enter all details."
 			STATUS="incomplete"
 		fi
+		unset IFS
 set -x
 	done
 }
diff --git a/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions b/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions
index e7f3381cf..1f88a758f 100644
--- a/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions
+++ b/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions
@@ -1,6 +1,13 @@
 #exec </dev/null >>/var/log/xfwm4.log  2>&1
 #set -x
 
+TSUSER="`id -un`"
+if [ "$TSUSER" != "root" ]; then
+        HOME=/home/$TSUSER
+else
+        HOME=/root
+fi
+
 make_desktop()
 {
 	mkdir -p "$ICONDIR"