diff --git a/nextcloud/root/etc/cont-init.d/30_define_user b/nextcloud/root/etc/cont-init.d/30_define_user
new file mode 100644
index 000000000..20853aead
--- /dev/null
+++ b/nextcloud/root/etc/cont-init.d/30_define_user
@@ -0,0 +1,20 @@
+#!/usr/bin/with-contenv bashio
+bashio::log.info "Checking permissions..."
+PUID=$(bashio::config "PUID")
+PGID=$(bashio::config "PGID")
+OLDPUID=""
+OLDPGID="" 
+if [ -f /data/puid ] && [ -f /data/pgid ]; then
+  OLDPUID=$(cat /data/puid)
+  OLDPGID=$(cat /data/pgid)
+fi
+
+if [ "$OLDPUID" != "$PUID" ] && [ "$OLDPGID" != "$PGID" ]; then
+bashio::log.info "... the user has changed from ${OLDPUID}:${OLDPGID} to ${PUID}:${PGID} ..."
+/defaults/nextcloud-perms.sh
+fi
+bashio::log.info "... done"
+
+#storing user id
+echo "$(bashio::config "PUID")" > "/data/puid"
+echo "$(bashio::config "PGID")" > "/data/pgid"
diff --git a/nextcloud/root/etc/cont-init.d/99_store_user b/nextcloud/root/etc/cont-init.d/99_store_user
deleted file mode 100644
index 6514b4f33..000000000
--- a/nextcloud/root/etc/cont-init.d/99_store_user
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-#storing user id
-echo "$(bashio::config "PUID")" > "/data/puid"
-echo "$(bashio::config "PGID")" > "/data/pgid"