diff --git a/modules/server/containers/apps/nextcloud.nix b/modules/server/containers/apps/nextcloud.nix
index 6399951..af6d385 100644
--- a/modules/server/containers/apps/nextcloud.nix
+++ b/modules/server/containers/apps/nextcloud.nix
@@ -67,7 +67,7 @@ in {
         sleep 2
       done
 
-      INSTALLED=$($OCC status --output=json | grep -o '"installed":false')
+      INSTALLED=$($OCC status --output=json | grep -o '"installed":true')
       if [ -z "$INSTALLED" ]; then
         echo "Running first-time setup..."
         
@@ -75,7 +75,8 @@ in {
           --admin-user "$DEFAULT_ADMIN_USERNAME" \
           --admin-pass "$DEFAULT_ADMIN_PASSWORD"
       fi
-      if [ -z "$INSTALLED" ]; then
+      if [ -z "$INSTALLED" ] || [ -f "/tmp/force-nextcloud-setup" ]; then
+        rm -f "/tmp/force-nextcloud-setup"
         echo "Applying Settings..."
         
         $OCC config:system:set default_phone_region --value="CH"