diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index be45e370f8..2c12a90d7a 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -162,6 +162,11 @@ function PMA_auth()
 if (top != self) {
     window.top.location.href=location;
 }
+// reveal the login form to users with JS enabled
+$(document).ready(function () {
+    $('form.login').show();
+    $('div.language').show();
+});
 //]]>
 </script>
 </head>
@@ -199,7 +204,11 @@ if (top != self) {
         PMA_Message::rawError($conn_error)->display();
     }
 
-    echo "<div class='language'>";
+    echo "<noscript>\n";
+    PMA_message::error(__("Javascript must be enabled past this point"))->display();
+    echo "</noscript>\n";
+
+    echo "<div class='language hide'>";
     // Displays the languages form
     if (empty($GLOBALS['cfg']['Lang'])) {
         include_once './libraries/display_select_lang.lib.php';
@@ -211,7 +220,7 @@ if (top != self) {
     ?>
 <br />
 <!-- Login form -->
-<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top" class="login">
+<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top" class="login hide">
     <fieldset>
     <legend>
 <?php