diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 1917d6b34f..edf13a3c94 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -8,7 +8,7 @@
 
         <div data-role="content">
 
-            <form id="manualLoginForm" style="display: none; text-align: center; margin: 0 auto;">
+            <form class="manualLoginForm" id="manualLoginForm" style="display: none; text-align: center; margin: 0 auto;">
                 <h2 style="text-align: left;">Please sign in</h2>
 
                 <label for="txtManualName" style="text-align: left;">User:</label>
@@ -24,7 +24,11 @@
                 </p>
             </form>
 
-            <div id="divUsers" style="display: none; margin: 50px 0 20px; text-align: center;"></div>
+            <div class="visualLoginForm" style="display: none; text-align: center;">
+                <div id="divUsers"></div>
+
+                <p style="text-align: center;"><a onclick="$('.manualLoginForm').show();$('.visualLoginForm').hide();" href="#">Manual Login</a></p>
+            </div>
         </div>
 
         <div data-role="popup" id="popupLogin" class="ui-corner-all popup">
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 69dc0b4c09..2d53f16e45 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -20,12 +20,12 @@
 
             if (showManualForm) {
 
-                $('#divUsers', '#loginPage').hide();
+                $('.visualLoginForm', '#loginPage').hide();
                 $('#manualLoginForm', '#loginPage').show();
 
             } else {
 
-                $('#divUsers', '#loginPage').show();
+                $('.visualLoginForm', '#loginPage').show();
                 $('#manualLoginForm', '#loginPage').hide();
 
                 LoginPage.loadUserList(users);