diff --git a/entrypoint b/entrypoint
index e58c822..3390d06 100755
--- a/entrypoint
+++ b/entrypoint
@@ -7,11 +7,15 @@ GROUP_ID=${PGID:-$USER_ID}
 echo "Starting with UID : $USER_ID:$GROUP_ID"
 GROUP=proton
 if getent group $GROUP_ID > /dev/null; then
+  echo "Using group $GROUP with GID $GROUP_ID..."
   GROUP=$(getent group $GROUP_ID | cut -d: -f1)
+  echo "Using group $GROUP with GID $GROUP_ID..."
 else
-  groupadd -g $GROUP_ID $GROUP
+  echo "Adding group $GROUP with GID $GROUP_ID..."
+  addgroup -g $GROUP_ID $GROUP
 fi
-addgroup -g $GROUP_ID proton
+echo "Adding user proton with group $GROUP..."
+echo adduser -D -u $USER_ID -G $GROUP -h /var/lib/proton -s /bin/sh proton
 adduser -D -u $USER_ID -G $GROUP -h /var/lib/proton -s /bin/sh proton
 chown -R ${USER_ID}:${GROUP_ID} /var/lib/proton
 export HOME=/var/lib/proton
@@ -23,4 +27,4 @@ setcap 'cap_net_bind_service=+ep' /usr/bin/socat
 socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
 socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
 
-exec /sbin/su-exec proton "$@"
\ No newline at end of file
+exec /sbin/su-exec proton "$@"