diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py
index d12b0c60..bb7e373f 100644
--- a/src/octoprint/server/views.py
+++ b/src/octoprint/server/views.py
@@ -223,10 +223,12 @@ def index():
 	else:
 		wizard = wizard_active(_templates)
 		enable_accesscontrol = userManager.enabled
+		accesscontrol_active = enable_accesscontrol and userManager.hasBeenCustomized()
 		render_kwargs.update(dict(
 			webcamStream=settings().get(["webcam", "stream"]),
 			enableTemperatureGraph=settings().get(["feature", "temperatureGraph"]),
 			enableAccessControl=enable_accesscontrol,
+			accessControlActive=accesscontrol_active,
 			enableSdSupport=settings().get(["feature", "sdSupport"]),
 			gcodeMobileThreshold=settings().get(["gcodeViewer", "mobileSizeThreshold"]),
 			gcodeThreshold=settings().get(["gcodeViewer", "sizeThreshold"]),
diff --git a/src/octoprint/static/js/app/viewmodels/wizard.js b/src/octoprint/static/js/app/viewmodels/wizard.js
index 86e0e904..adf7e1bf 100644
--- a/src/octoprint/static/js/app/viewmodels/wizard.js
+++ b/src/octoprint/static/js/app/viewmodels/wizard.js
@@ -18,7 +18,7 @@ $(function() {
         };
 
         self.showDialog = function() {
-            if (!CONFIG_WIZARD || !(CONFIG_FIRST_RUN || self.loginState.isAdmin())) return;
+            if (!CONFIG_WIZARD || !((CONFIG_FIRST_RUN && !CONFIG_ACCESS_CONTROL_ACTIVE) || self.loginState.isAdmin())) return;
 
             self.getWizardDetails()
                 .done(function(response) {
diff --git a/src/octoprint/templates/initscript.jinja2 b/src/octoprint/templates/initscript.jinja2
index 6d02f35f..73d0c7f2 100644
--- a/src/octoprint/templates/initscript.jinja2
+++ b/src/octoprint/templates/initscript.jinja2
@@ -12,6 +12,7 @@
     var CONFIG_USERSPERPAGE = 10;
     var CONFIG_WEBCAM_STREAM = "{{ webcamStream|e }}";
     var CONFIG_ACCESS_CONTROL = {% if enableAccessControl -%} true; {% else %} false; {%- endif %}
+    var CONFIG_ACCESS_CONTROL_ACTIVE = {% if accessControlActive -%} true; {% else %} false; {%- endif %}
     var CONFIG_SD_SUPPORT = {% if enableSdSupport -%} true; {% else %} false; {%- endif %}
     var CONFIG_FIRST_RUN = {%  if firstRun -%} true; {% else %} false; {%- endif %}
     var CONFIG_TEMPERATURE_GRAPH = {%  if enableTemperatureGraph -%} true; {% else %} false; {%- endif %}