diff --git a/Scripts/bootstrap-ansible.sh b/Scripts/bootstrap-ansible.sh
index b39e299..ed727f5 100755
--- a/Scripts/bootstrap-ansible.sh
+++ b/Scripts/bootstrap-ansible.sh
@@ -38,9 +38,11 @@ mkdir /home/$USERNAME/.ssh \
 && chown -R $USERNAME:$USERNAME /home/$USERNAME \
 || exit 3
 
-if [ -d /var/lib/AccountsService/users ]; then
-	echo "[User]">/var/lib/AccountsService/users/$USERNAME
-	echo "SystemAccount=true">>/var/lib/AccountsService/users/$USERNAME
+if [ -e $DEBFLAG ]; then
+	if [ -d /var/lib/AccountsService/users ]; then
+ 		echo "[User]">/var/lib/AccountsService/users/$USERNAME
+		echo "SystemAccount=true">>/var/lib/AccountsService/users/$USERNAME
+	fi
 fi
 
 if [ -e $DEBFLAG ]; then
diff --git a/templates/secure-tunnel.service b/templates/secure-tunnel.service
index 030ef92..47c0f83 100644
--- a/templates/secure-tunnel.service
+++ b/templates/secure-tunnel.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 User={{ANS_REMOTE_USER}}
-ExecStartPre=cd /home/{{ANS_REMOTE_USER}}
+#ExecStartPre=cd /home/{{ANS_REMOTE_USER}}
 EnvironmentFile=/etc/default/secure-tunnel
 ExecStart=/usr/bin/ssh -p ${REMOTE_PORT} -NT -i /home/{{ANS_REMOTE_USER}}/.ssh/{{KEY_NAME}} -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R ${RTARGET_PORT}:localhost:22 ${ANS_TARGET_USER}@${TARGET}