diff --git a/share/jupyter/static/less/login.less b/share/jupyter/static/less/login.less
index 5873050d..3d475580 100644
--- a/share/jupyter/static/less/login.less
+++ b/share/jupyter/static/less/login.less
@@ -1,49 +1,33 @@
 #login-main {
-     & >  form {
-        margin: 80px auto;
+    form {
+        margin: 8px auto;
         width: 400px;
         padding: 50px;
-        margin-top: 8px;
-        border: 1px solid black;
+        border: 1px solid #ccc;
+        font-size: large;
+    }
+    
+    * {
+        border-radius: 0px;
     }
 
-
-    & .input-group{
-        width:100%;
+    .input-group, input, button {
+        width: 100%;
     }
 
-    & .input-group-addon {
-        width:100px;
-        border-radius:0;
+    .input-group-addon {
+        width: 100px;
     }
 
-    & .form-control{
-        font-size:large;
-    }
-
-    & input[type=username]
-    {
-        width:100%;
-        border-radius:0;
-    }
-
-    & input[type=password]{
-        width:100%;
-        margin-top:-1px;
-        border-radius:0;
-    }
-
-    & button[type=submit]{
-        margin-top:10px;
-        width:100%;
-    }
-
-    & input[type=password]:focus,input[type=username]:focus{
+    input:focus {
         z-index: 5;
     }
-
-    & #pwd-addon{
-        border-top:none;
+    
+    .pwd-group {
+        margin-top: -1px;
+    }
+    
+    button[type=submit] {
+        margin-top: 16px;
     }
-
 }
diff --git a/share/jupyter/templates/login.html b/share/jupyter/templates/login.html
index 6a1234df..86630534 100644
--- a/share/jupyter/templates/login.html
+++ b/share/jupyter/templates/login.html
@@ -11,15 +11,11 @@
           <span class="input-group-addon">Username:</span>
           <input type="username" class="form-control" name="username" id="username_input" val="{{username}}">
         </div>
-        <div class="input-group">
-          <span id='pwd-addon' class="input-group-addon">Password:</span>
+        <div class="input-group pwd-group">
+          <span class="input-group-addon">Password:</span>
           <input type="password" class="form-control" name="password" id="password_input">
         </div>
-        <div class="input-group">
-          <span class="input-group-btn">
-            <button type="submit" id="login_submit" class="btn btn-default">Log in</button>
-          </span>
-        </div>
+        <button type="submit" id="login_submit" class="btn btn-default">Log in</button>
   </form>
   {% if message %}
   <div class="row">