diff --git a/src/Api/entrypoint.sh b/src/Api/entrypoint.sh
index 5e2addb503..424c78e951 100644
--- a/src/Api/entrypoint.sh
+++ b/src/Api/entrypoint.sh
@@ -23,11 +23,10 @@ if [ "$(id -u)" = "0" ]
 then
     # Create user and group
 
-    groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
-    groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
-    useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
-    usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
-    mkhomedir_helper $USERNAME
+    addgroup -g "$LGID" -S "$GROUPNAME" 2>/dev/null || true
+    adduser -u "$LUID" -G "$GROUPNAME" -S -D -H "$USERNAME" 2>/dev/null || true
+    mkdir -p /home/$USERNAME
+    chown $USERNAME:$GROUPNAME /home/$USERNAME
 
     # The rest...