diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index ed487cf..131088d 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -91,17 +91,6 @@ if [ ! -f "$INITALIZED" ]; then
   # FAIL FAST START
   [ ! -z ${FAIL_FAST+x} ] && set -e
 
-  ##
-  # Create GROUPS
-  ##
-  for I_CONF in $(env | grep '^GROUP_')
-  do
-    GROUP_NAME=$(echo "$I_CONF" | sed 's/^GROUP_//g' | sed 's/=.*//g')
-    GROUP_ID=$(echo "$I_CONF" | sed 's/^[^=]*=//g')
-    echo ">> GROUP: adding group $GROUP_NAME with GID: $GROUP_ID"
-    addgroup -g "$GROUP_ID" "$GROUP_NAME"
-  done
-
   ##
   # Create USER ACCOUNTS
   ##
@@ -134,6 +123,17 @@ if [ ! -f "$INITALIZED" ]; then
     
     smbpasswd -e "$ACCOUNT_NAME"
   done
+  
+  ##
+  # Create GROUPS
+  ##
+  for I_CONF in $(env | grep '^GROUP_')
+  do
+    GROUP_NAME=$(echo "$I_CONF" | sed 's/^GROUP_//g' | sed 's/=.*//g')
+    GROUP_ID=$(echo "$I_CONF" | sed 's/^[^=]*=//g')
+    echo ">> GROUP: adding group $GROUP_NAME with GID: $GROUP_ID"
+    addgroup -g "$GROUP_ID" "$GROUP_NAME"
+  done
 
   ##
   # Add USER ACCOUNTS to GROUPS