diff --git a/server/usr/local/sbin/rs-add-user b/server/usr/local/sbin/rs-add-user
index 8b36486..477b393 100755
--- a/server/usr/local/sbin/rs-add-user
+++ b/server/usr/local/sbin/rs-add-user
@@ -19,7 +19,7 @@ remote_username="$2"
 ssh_key_file="$3"
 local_username="${remote_hostname}-${remote_username}"
 
-useradd -G backup -b "${BACKUP_ROOT}" -m -k /etc/rs-skel -p '*' -s /bin/sh "${local_username}"
+useradd -G backup -b "${BACKUP_ROOT}" -m -k /etc/rs-skel -p '*' -s /bin/bash "${local_username}"
 rs-update-passwd
 
 # Generate config files from templates
diff --git a/server/usr/local/sbin/rs-update-passwd b/server/usr/local/sbin/rs-update-passwd
index 48a1421..828bb0f 100755
--- a/server/usr/local/sbin/rs-update-passwd
+++ b/server/usr/local/sbin/rs-update-passwd
@@ -8,4 +8,4 @@ if [ "${BACKUP_ROOT}" == "" ] || [ "$(realpath ${BACKUP_ROOT})" == "/" ]; then
 	exit 1
 fi
 
-cat /etc/passwd | grep "::${BACKUP_ROOT}/[^/:]\+:/bin/sh$" > "${BACKUP_ROOT}/etc/passwd"
+cat /etc/passwd | grep "::${BACKUP_ROOT}/[^/:]\+:/bin/[^:]\+$" > "${BACKUP_ROOT}/etc/passwd"