diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 470b34f..12cc4ed 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -1970,6 +1970,8 @@ function FirstRunViewModel() {
     });
 
     self.keepAccessControl = function() {
+        if (!self.validData()) return;
+
         var data = {
             "ac": true,
             "user": self.username(),
diff --git a/octoprint/templates/dialogs.jinja2 b/octoprint/templates/dialogs.jinja2
index bab7fda..5185742 100644
--- a/octoprint/templates/dialogs.jinja2
+++ b/octoprint/templates/dialogs.jinja2
@@ -53,48 +53,51 @@
     </div>
     <div class="modal-body">
         <p>
-            OctoPrint by default now ships with Access Control enabled, meaning you won't be able to do anything with the
-            printer unless you login first as a configured user. This is to prevent strangers (possibly with
-            malicious intent) to gain access to printer for using it in such a way that it may be damaged or worse, in case
-            you make your OctoPrint installation accessible to the internet or other untrustworthy computer networks.
+            <strong>Please read the following, it is very important for your printer's health!</strong>
         </p>
-        <div>
-            <p>
-                It looks like you haven't configured access control yet. Please set up the username and password for the
-                initial administrator account who will have full access to both the printer and OctoPrint's settings:
-            </p>
-            <form class="form-horizontal">
-                <div class="control-group" data-bind="css: {success: validUsername()}">
-                    <label class="control-label" for="first_run_username">Username</label>
-                    <div class="controls">
-                        <input type="text" class="input-medium" data-bind="value: username, valueUpdate: 'afterkeydown'">
-                    </div>
-                </div>
-                <div class="control-group" data-bind="css: {success: validPassword()}">
-                    <label class="control-label" for="first_run_username">Password</label>
-                    <div class="controls">
-                        <input type="password" class="input-medium" data-bind="value: password, valueUpdate: 'afterkeydown'">
-                    </div>
-                </div>
-                <div class="control-group" data-bind="css: {error: passwordMismatch(), success: validPassword() && !passwordMismatch()}">
-                    <label class="control-label" for="first_run_username">Confirm Password</label>
-                    <div class="controls">
-                        <input type="password" class="input-medium" data-bind="value: confirmedPassword, valueUpdate: 'afterkeydown'">
-                        <span class="help-inline" data-bind="visible: passwordMismatch()">Passwords don't match</span>
-                    </div>
-                </div>
-            </form>
-        </div>
         <p>
-            In case that your OctoPrint installation is only accessible from within a network only trustworthy people have
-            access to and you don't need Access Control for other reasons, you may alternatively disable Access Control
-            all together. You should really only do this if you are absolutely sure that only people you know and trust
-            will be able to connect to it. To reiterate, do <strong>NOT</strong> underestimate the risk of an unsecured
-            access to your printer!
+            OctoPrint by default now ships with Access Control enabled, meaning you won't be able to do anything with the
+            printer unless you login first as a configured user. This is to <strong>prevent strangers - possibly with
+            malicious intent - to gain access to your printer</strong> via the internet or another untrustworthy network
+            and using it in such a way that it is damaged or worse (i.e. causes a fire).
+        </p>
+        <p>
+            It looks like you haven't configured access control yet. Please <strong>set up an username and password</strong> for the
+            initial administrator account who will have full access to both the printer and OctoPrint's settings, then click
+            on "Keep Access Control Enabled":
+        </p>
+        <form class="form-horizontal">
+            <div class="control-group" data-bind="css: {success: validUsername()}">
+                <label class="control-label" for="first_run_username">Username</label>
+                <div class="controls">
+                    <input type="text" class="input-medium" data-bind="value: username, valueUpdate: 'afterkeydown'">
+                </div>
+            </div>
+            <div class="control-group" data-bind="css: {success: validPassword()}">
+                <label class="control-label" for="first_run_username">Password</label>
+                <div class="controls">
+                    <input type="password" class="input-medium" data-bind="value: password, valueUpdate: 'afterkeydown'">
+                </div>
+            </div>
+            <div class="control-group" data-bind="css: {error: passwordMismatch(), success: validPassword() && !passwordMismatch()}">
+                <label class="control-label" for="first_run_username">Confirm Password</label>
+                <div class="controls">
+                    <input type="password" class="input-medium" data-bind="value: confirmedPassword, valueUpdate: 'afterkeydown'">
+                    <span class="help-inline" data-bind="visible: passwordMismatch()">Passwords don't match</span>
+                </div>
+            </div>
+        </form>
+        <p>
+            <strong>Note:</strong> In case that your OctoPrint installation is only accessible from within a trustworthy network and you don't
+            need Access Control for other reasons, you may alternatively disable Access Control. You should only
+            do this if you are absolutely certain that only people you know and trust will be able to connect to it.
+        </p>
+        <p>
+            <strong>Do NOT underestimate the risk of an unsecured access from the internet to your printer!</strong>
         </p>
     </div>
     <div class="modal-footer">
         <a href="#" class="btn btn-danger" data-bind="click: disableAccessControl">Disable Access Control</a>
-        <a href="#" class="btn btn-primary" data-bind="click: keepAccessControl, enable: validData()">Keep Access Control Enabled</a>
+        <a href="#" class="btn btn-primary" data-bind="click: keepAccessControl, enable: validData(), css: {disabled: !validData()}">Keep Access Control Enabled</a>
     </div>
 </div>
\ No newline at end of file