diff --git a/dashboard-ui/allusersettings.html b/dashboard-ui/allusersettings.html
index 1cc42ef4b4..2ac13dc997 100644
--- a/dashboard-ui/allusersettings.html
+++ b/dashboard-ui/allusersettings.html
@@ -27,7 +27,7 @@
 
                     </div>
 
-                    <div class="fieldDescription">This will be ignored by the web client on localhost. When disabled clients may present a login screen with a visual selection of users.</div>
+                    <div class="fieldDescription">When disabled clients may present a login screen with a visual selection of users.</div>
 
                     <br />
                     <br />
diff --git a/dashboard-ui/css/notifications.css b/dashboard-ui/css/notifications.css
index 44be7c0df6..8d84476b73 100644
--- a/dashboard-ui/css/notifications.css
+++ b/dashboard-ui/css/notifications.css
@@ -178,6 +178,10 @@
     .notificationsFlyout {
         width: 450px;
     }
+
+    .notificationContent p {
+        max-width: 350px;
+    }
 }
 
 @media all and (min-width: 600px) {
@@ -189,4 +193,8 @@
         width: 60px;
         height: 60px;
     }
+
+    .notificationContent p {
+        max-width: 400px;
+    }
 }
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 1d62f954ac..1917d6b34f 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -49,7 +49,7 @@
         </div>
 
         <script type="text/javascript">
-            $('#loginForm').on('submit', LoginPage.onSubmit);
+            $('.loginForm').on('submit', LoginPage.onSubmit);
             $('#manualLoginForm').on('submit', LoginPage.onManualSubmit);
         </script>
     </div>
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index c333071240..f5d6795a73 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -3,7 +3,8 @@
     onPageShow: function () {
         Dashboard.showLoadingMsg();
 
-        var promise1 = ApiClient.getPublicUsers();
+        // Show all users on localhost
+        var promise1 = window.location.toString().toLowerCase().indexOf('localhost') == -1 ? ApiClient.getPublicUsers() : ApiClient.getUsers({ IsDisabled: false });
         var promise2 = ApiClient.getServerConfiguration();
 
         $.when(promise1, promise2).done(function (response1, response2) {
@@ -17,9 +18,6 @@
 
             }).length || !users.length;
 
-            // Always display users on localhost, just in case they forgot
-            showManualForm &= window.location.toString().toLowerCase().indexOf('localhost') == -1;
-
             if (showManualForm) {
 
                 $('#divUsers', '#loginPage').hide();
@@ -71,7 +69,7 @@
         ApiClient.authenticateUserByName(username, password).done(function (result) {
 
             var user = result.User;
-            
+
             Dashboard.setCurrentUser(user.Id);
 
             if (user.Configuration.IsAdministrator) {