diff --git a/ApiClient.js b/ApiClient.js
index 4a0222139..8b602610a 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -1429,6 +1429,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
             });
         };
 
+        self.getPublicUsers = function () {
+
+            var url = self.getUrl("users/public");
+
+            return self.ajax({
+                type: "GET",
+                url: url,
+                dataType: "json"
+            });
+        };
+
         /**
          * Gets all users from the server
          */
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 5b01a0f06..238fbcf42 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -3,7 +3,7 @@
     onPageShow: function () {
         Dashboard.showLoadingMsg();
 
-        var promise1 = ApiClient.getUsers({ IsHidden: false });
+        var promise1 = ApiClient.getPublicUsers();
         var promise2 = ApiClient.getServerConfiguration();
 
         $.when(promise1, promise2).done(function (response1, response2) {
@@ -76,6 +76,8 @@
         }).fail(function () {
 
             $('#pw', '#loginPage').val('');
+            $('#txtManualName', '#loginPage').val('');
+            $('#txtManualPassword', '#loginPage').val('');
 
             Dashboard.hideLoadingMsg();
 
diff --git a/packages.config b/packages.config
index a8a737923..a1b6ec005 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.138" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.139" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.54" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" />
 </packages>
\ No newline at end of file