diff --git a/templates/common-templates/filesystem/usr/local/bin/container-create-user.sh b/templates/common-templates/filesystem/usr/local/bin/container-create-user.sh
index e943bc7..2094238 100755
--- a/templates/common-templates/filesystem/usr/local/bin/container-create-user.sh
+++ b/templates/common-templates/filesystem/usr/local/bin/container-create-user.sh
@@ -435,8 +435,8 @@ function fxnRunAsUser()
                 ;;
 
             'Debian' )
-                # Log in interactively with no password as new user
-                login -p -f  "${USER_NAME}"
+                # Start the shell as a login shell with an env similar to a real login
+                runuser -l "${USER_NAME}"
                 ;;
 
             * )