diff --git a/CloudronManifest.json b/CloudronManifest.json
index 6b10df1..87e5f9b 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -52,6 +52,10 @@
   "checklist": {
     "change-default-password": {
       "message": "Change the default admin password"
+    },
+    "disable-registration": {
+      "message": "Disable registration, if required, to prevent misuse",
+      "sso": false
     }
   },
   "minBoxVersion": "8.1.0",
diff --git a/start.sh b/start.sh
index 420f0bc..a93a3dd 100755
--- a/start.sh
+++ b/start.sh
@@ -78,6 +78,11 @@ if [[ ! -f /app/data/app.ini ]]; then
 
     echo "==> Generating new SECRET_KEY"
     crudini --set "/app/data/app.ini" security SECRET_KEY $(pwgen -1 -s)
+
+    if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
+        crudini --set "/app/data/app.ini" service DISABLE_REGISTRATION false
+        crudini --set "/app/data/app.ini" service SHOW_REGISTRATION_BUTTON true
+    fi
 fi
 
 # merge user config file