diff --git a/configuration.sh b/configuration.sh
index 82c6170e1..539ea03bf 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -120,7 +120,7 @@ PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-f
 	gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu bluetooth \
 	network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 libgcr-3-common p11-kit pasystray pavucontrol pulseaudio \
 	paman pavumeter pulseaudio-module-gconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri mpv \
-	libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1 fbi xfce4-power-manager"
+	libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1 fbi xfce4-power-manager profile-sync-daemon"
 
 # Release specific packages
 case $RELEASE in
diff --git a/scripts/check_first_login.sh b/scripts/check_first_login.sh
index f4516b6ad..b06d13dbf 100644
--- a/scripts/check_first_login.sh
+++ b/scripts/check_first_login.sh
@@ -12,11 +12,11 @@ check_abort()
 
 add_profile_sync_settings()
 {
-	config_file="$(psd 2>&1 | tr ' ' '\n' | grep 'psd.conf')"
+	/usr/bin/psd >/dev/null 2>&1 && config_file="${HOME}/.config/psd/psd.conf"
 	if [ -f "${config_file}" ]; then
 		# test for overlayfs
 		sed -i 's/#USE_OVERLAYFS=.*/USE_OVERLAYFS="yes"/' "${config_file}"
-		case $(psd p 2>/dev/null | grep Overlayfs) in
+		case $(/usr/bin/psd p 2>/dev/null | grep Overlayfs) in
 			*active*)
 				echo -e "\nConfigured profile sync daemon with overlayfs."
 				;;
@@ -55,7 +55,7 @@ add_user()
 	if [ $? -eq 0 ]; then
 		echo -e "${RealUserName} ALL=(ALL) NOPASSWD: /usr/bin/psd-overlay-helper" >>/etc/sudoers
 		export -f add_profile_sync_settings
-		su ${RealUserName} -c "bash -c add_profile_sync_settings" >/dev/null 2>&1
+		su ${RealUserName} -c "bash -c add_profile_sync_settings" 2>/dev/null
 	fi
 }