diff --git a/application/app/templates/registration/login.html b/application/app/templates/registration/login.html
index 14dc819..32b6ab0 100644
--- a/application/app/templates/registration/login.html
+++ b/application/app/templates/registration/login.html
@@ -45,8 +45,8 @@
                             <td><button type="button" class="pinpadBtn" data-btn="9">9</button></td>
                         </tr>
                         <tr>
-                            <td><button type="button" class="pinpadBtn" data-btn="0">0</button></td>
                             <td><button type="button" class="pinpadBtn" data-btn="x">x</button></td>
+                            <td><button type="button" class="pinpadBtn" data-btn="0">0</button></td>
                             <td><button type="button" class="pinpadBtn" data-btn="enter">&#9166;</button></td>
                         </tr>
                     </table>
@@ -64,7 +64,7 @@
 
     <h1>{% translate "Choose your account" %}</h1>
 
-    <div class="userlistContainer">
+    <div class="userlistContainer" id="userlistContainer">
         <ul class="userlist">
             {% for user_ in user_list %}
                 <li class="userlistButton button" data-username="{{ user_.username }}">
diff --git a/lib/env.sh b/lib/env.sh
index d11c933..ba983e8 100644
--- a/lib/env.sh
+++ b/lib/env.sh
@@ -2,5 +2,5 @@
 
 export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt"
 export STATIC_FILES="$(pwd)/static/"
-export APP_VERSION="10"
+export APP_VERSION="11"
 export PYTHONPATH="$(pwd)/packages/"
diff --git a/static/js/login.js b/static/js/login.js
index df54187..aea0630 100644
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -5,11 +5,11 @@
     let username_input;
     let password_input;
     let submit_button;
-    let username_display;
     let password_overlay;
     let pw_overlay_cancel;
     let userlist_buttons;
     let pinpad_buttons;
+    let userlist_container;
 
 
     // Add event listeners after DOM Content loaded
@@ -23,6 +23,7 @@
         submit_button = document.getElementById("submit_login");
         password_overlay = document.getElementById("passwordOverlayContainer");
         pw_overlay_cancel = document.getElementById("pwoCancel");
+        userlist_container = document.getElementById("userlistContainer");
 
         userlist_buttons = document.getElementsByClassName("userlistButton");
         pinpad_buttons = document.getElementsByClassName("pinpadBtn");
@@ -59,15 +60,14 @@
 
         window.scrollTo(0, 0);
         password_overlay.classList.remove("nodisplay");
-        document.body.classList.add("overflowHidden");
-        //password_input.focus();
+        userlist_container.classList.add("nodisplay");
 
     }
 
     function hide_password_overlay() {
 
         password_overlay.classList.add("nodisplay");
-        document.body.classList.remove("overflowHidden");
+        userlist_container.classList.remove("nodisplay");
         password_input.value = "";
 
     }