diff --git a/client_software/install.sh b/client_software/install.sh
index ece4cb2..515e66d 100755
--- a/client_software/install.sh
+++ b/client_software/install.sh
@@ -18,7 +18,7 @@ if [ "${DAVTOKEN_USER}." == "." ]; then
 fi
 
 echo "Installing additional Software."
-for DIR in $(ls -d /${SCRIPTPATH}/*/ | sort);     # list directories in the form "/tmp/dirname/"
+for DIR in $(ls -d /${CLIENT_SOFTWARE_DST}/*/ | sort);     # list directories in the form "/tmp/dirname/"
 do
     DIR=${DIR%*/}      # remove the trailing "/"
     if [ -f "${DIR}/install.sh" ]; then
diff --git a/system_setup/logon_script.sh b/system_setup/logon_script.sh
index 1e9e988..c836957 100755
--- a/system_setup/logon_script.sh
+++ b/system_setup/logon_script.sh
@@ -82,6 +82,7 @@ else
         echo "Press any key to continue" && read -n 1 -s -r && exit 1
     fi
 fi
+echo
 
 #SYNC Firefox + Thunderbird Profile
 ./mozilla_starter.sh firefox sync && ./mozilla_starter.sh thunderbird sync