diff --git a/Scripts/bootstrap-ansible.sh b/Scripts/bootstrap-ansible.sh
index b39e299..1ee4b77 100755
--- a/Scripts/bootstrap-ansible.sh
+++ b/Scripts/bootstrap-ansible.sh
@@ -38,9 +38,13 @@ 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 [ "$(cat $DEBFLAG)" == "buster/sid" ]; 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
 fi
 
 if [ -e $DEBFLAG ]; then