diff --git a/data/etc/profile b/data/etc/profile
index e6433291e5..a509320e04 100644
--- a/data/etc/profile
+++ b/data/etc/profile
@@ -5,9 +5,6 @@
 
 echo -e "\nWelcome to the Haiku shell.\n"
 
-# switch to $HOME
-cd
-
 export PS1="\w> "
 export HISTFILESIZE=50
 
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index a6f0cefa21..648256133e 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -90,7 +90,7 @@ launch $SERVERS/debug_server				# launch debug_server
 
 # Init Network
 if [ "$SAFEMODE" != "yes" ]; then
-	launch $SERVERS/net_server			# launch net_server
+	launch $SERVERS/net_server				# launch net_server
 fi
 
 if [ "$SAFEMODE" != "yes" ]; then
@@ -120,6 +120,7 @@ if [ "$SAFEMODE" != "yes" ]; then
 		launch system/Login
 		# nothing more
 	else
+		cd /boot/home
 		launch system/Tracker
 		launch system/Deskbar
 
diff --git a/data/system/boot/Bootscript.cd b/data/system/boot/Bootscript.cd
index d6703be576..0e56be2ed5 100644
--- a/data/system/boot/Bootscript.cd
+++ b/data/system/boot/Bootscript.cd
@@ -47,6 +47,7 @@ runprog() {
 
 # Launch Terminal or consoled depending on $SAFEMODE
 if [ "$SAFEMODE" != "yes" ]; then
+	cd /boot/home
 	if [ -x /boot/system/apps/Installer ]; then
 		/boot/system/apps/Installer
 		#/boot/system/apps/Terminal -x /boot/system/apps/Installer