diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 494c0d47f6..2af6db5c69 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -28,6 +28,8 @@
                 <div id="divUsers"></div>
 
                 <p style="text-align: center;"><a onclick="$('.manualLoginForm').show();$('.visualLoginForm').hide();" href="#">Manual Login</a></p>
+
+                <p style="text-align: center;">Note: Passwords are not required when logging in from localhost.</p>
             </div>
         </div>
 
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 104a3387c4..8512009c4e 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -72,7 +72,7 @@
         });
 
     },
-    
+
     authenticateUserByName: function (username, password) {
 
         Dashboard.showLoadingMsg();
@@ -107,12 +107,17 @@
     loadUserList: function (users) {
         var html = "";
 
+        var isLocalhost = window.location.toString().toLowerCase().indexOf('localhost') != -1;
+
         for (var i = 0, length = users.length; i < length; i++) {
             var user = users[i];
 
             var linkId = "lnkUser" + i;
 
-            if (user.HasPassword) {
+            if (isLocalhost) {
+                html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-userid='" + user.Id + "' href='index.html?u=" + user.Id + "' data-ajax='false' \">";
+            }
+            else if (user.HasPassword) {
                 html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-userid='" + user.Id + "' href='#popupLogin' data-rel='popup' onclick='LoginPage.authenticatingLinkId=this.id;' \">";
             } else {
                 html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-userid='" + user.Id + "' href='#' onclick='LoginPage.authenticateUserLink(this);' \">";
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index f491b8ab01..f6d22bb3bc 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -90,18 +90,22 @@ var Dashboard = {
         if (!window.localStorage) {
             return null;
         }
-        
-        var userId = localStorage.getItem("userId");
 
-        if (!userId) {
-            var autoLoginUserId = getParameterByName('u');
+        var autoLoginUserId = getParameterByName('u');
+        var userId;
+
+        if (autoLoginUserId) {
+            userId = localStorage.getItem("userId");
+
+            if (userId != autoLoginUserId) {
 
-            if (autoLoginUserId) {
                 userId = autoLoginUserId;
-                localStorage.setItem("userId", userId);
+                Dashboard.setCurrentUser(userId);
             }
         }
 
+        userId = userId || localStorage.getItem("userId");
+
         return userId;
     },
 
@@ -110,7 +114,7 @@ var Dashboard = {
         if (window.localStorage) {
             localStorage.setItem("userId", userId);
         }
-        
+
         ApiClient.currentUserId(userId);
         Dashboard.getUserPromise = null;
     },
@@ -120,7 +124,7 @@ var Dashboard = {
         if (window.localStorage) {
             localStorage.removeItem("userId");
         }
-        
+
         Dashboard.getUserPromise = null;
         ApiClient.currentUserId(null);
         window.location = "login.html";
@@ -804,7 +808,7 @@ var Dashboard = {
         var location = window.location;
 
         var webSocketUrl = "ws://" + location.hostname;
-        
+
         if (systemInfo.HttpServerPortNumber == systemInfo.WebSocketPortNumber) {
 
             if (location.port) {
@@ -1282,9 +1286,9 @@ var Dashboard = {
 
         return html;
     },
-    
-    populateLanguages: function(select, languages) {
-        
+
+    populateLanguages: function (select, languages) {
+
         var html = "";
 
         html += "<option value=''></option>";