diff --git a/dashboard-ui/allusersettings.html b/dashboard-ui/allusersettings.html
index 40e856f3d..1cc42ef4b 100644
--- a/dashboard-ui/allusersettings.html
+++ b/dashboard-ui/allusersettings.html
@@ -17,6 +17,7 @@
                 <form id="allUserSettingsForm">
 
                     <p>Require manual username entry for:</p>
+
                     <div data-role="controlgroup">
                         <input type="checkbox" data-mini="true" id="chkMobileClients" name="chkMobileClients" />
                         <label for="chkMobileClients">Mobile Clients</label>
@@ -25,7 +26,9 @@
                         <label for="chkMBT">Media Browser Theater</label>
 
                     </div>
-                    <div class="fieldDescription">This will be ignored on localhost</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>
+
                     <br />
                     <br />
 
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 7ae2ecd6c..1d62f954a 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -12,7 +12,7 @@
                 <h2 style="text-align: left;">Please sign in</h2>
 
                 <label for="txtManualName" style="text-align: left;">User:</label>
-                <input type="text" name="txtManualName" id="txtManualName" />
+                <input type="text" name="txtManualName" id="txtManualName" required="required" />
 
                 <label for="txtManualPassword" style="text-align: left;">Password:</label>
                 <input type="password" name="txtManualPassword" id="txtManualPassword" placeholder="password" />
diff --git a/dashboard-ui/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
index eba75b8a4..b181ab6de 100644
--- a/dashboard-ui/scripts/edituserpage.js
+++ b/dashboard-ui/scripts/edituserpage.js
@@ -59,7 +59,7 @@
         if (!loggedInUser.Configuration.IsAdministrator) {
             $('#parentalControlDiv', page).hide();
             $('#fldIsAdmin', page).hide();
-            $('#accessControlDiv', page).show();
+            $('#accessControlDiv', page).hide();
         } else {
             $('#parentalControlDiv', page).show();
             $('#accessControlDiv', page).show();
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 238fbcf42..c33307124 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -17,6 +17,7 @@
 
             }).length || !users.length;
 
+            // Always display users on localhost, just in case they forgot
             showManualForm &= window.location.toString().toLowerCase().indexOf('localhost') == -1;
 
             if (showManualForm) {
@@ -69,9 +70,15 @@
 
         ApiClient.authenticateUserByName(username, password).done(function (result) {
 
-            Dashboard.setCurrentUser(result.User.Id);
+            var user = result.User;
+            
+            Dashboard.setCurrentUser(user.Id);
 
-            window.location = "index.html?u=" + result.User.Id;
+            if (user.Configuration.IsAdministrator) {
+                window.location = "dashboard.html?u=" + user.Id;
+            } else {
+                window.location = "index.html?u=" + user.Id;
+            }
 
         }).fail(function () {