diff --git a/server.py b/server.py
index 6e30692..78a2823 100755
--- a/server.py
+++ b/server.py
@@ -168,8 +168,8 @@ def login():
 
 
 class LoginForm(Form):
-    username = StringField('Username', [validators.Length(min=4, max=50)])
-    password = PasswordField('Password', [validators.Length(min=4, max=50)])
+    username = StringField('Username', [validators.Length(max=255)])
+    password = PasswordField('Password', [validators.Length(max=255)])
     submit = SubmitField('Sign In')
 
 
diff --git a/templates/login.html b/templates/login.html
index b02670a..0d6cd1b 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -12,74 +12,46 @@
     <script src="{{ url_for('static', filename='js/bootstrap3-typeahead.min.js') }}"></script>
     <link rel="stylesheet" href="{{ url_for('static', filename='css/font-awesome.min.css') }}" rel="text/css">
 
-
 </head>
 <body>
-    <div id="popover_form" class="ajax_popover_form"></div>
-    <div id="popover_form_large" class="ajax_popover_form ajax_popover_form_large"></div>
-    <div id="popover_form_x_large" class="ajax_popover_form ajax_popover_form_x_large"></div>
-    <div id="popover_matrix" class="ajax_popover_form ajax_popover_matrix"></div>
-    <div id="popover_box" class="popover_box"></div>
-    <div id="screenshot_box" class="screenshot_box"></div>
-    <div id="confirmation_box" class="confirmation_box"></div>
-    <div id="gray_out" class="gray_out"></div>
-    <div id="container">
-        <div id="topBar" class="navbar navbar-inverse debugOff" style="z-index: 20;">
-  <div class="navbar-inner">
-    <ul class="nav">
-            </ul>
-    <ul class="nav pull-right">
-            </ul>
-  </div>
-</div>
-
-<input type="hidden" class="keyboardShortcutsConfig" value="/shortcuts/global_menu.json" />
-    </div>
     <div id="flashContainer" style="padding-top:50px; !important;">
         <div id="main-view-container" class="container-fluid ">
-                    </div>
+        </div>
     </div>
 
     <div>
         <div style="width:100%;">
     <table style="margin-left:auto;margin-right:auto;">
     <tr>
-    <td style="text-align:right;width:250px;padding-right:50px">
-            </td>
+    <td style="text-align:right;width:250px;padding-right:50px"></td>
     <td style="width:460px">
 
         <div>
             <img src="{{ url_for('static', filename='/pics/misp-logo.png') }}" style="display:block; margin-left: auto; margin-right: auto;"/>
         </div>
 
-        <div style="text-align:right;font-size:18px;">
-                Welcome to MISP-Dashboard
-        </div>
 
         <form action="" id="UserLoginForm" method="post" accept-charset="utf-8">
-            <legend>Login</legend><br>
+            <br><legend>Welcome to MISP-Dashboard</legend><br>
         <div class="input email required">
             {{ form.username.label }}<br>
-            {{ form.username(size=32) }}
+            {{ form.username(size=32, maxlength=255) }}
         </div>
         <div class="input password required">
             {{ form.password.label }}<br>
-            {{ form.password(size=32) }}
+            {{ form.password(size=32, maxlength=255) }}
         </div>
 
         <div class="clear"></div>
             <p>{{ form.submit() }}</p>
-{#        <button class="btn btn-primary" type="submit">Login</button>#}
-            </form>
+        </form>
 
     </td>
-    <td style="width:250px;padding-left:50px">
-            </td>
+    <td style="width:250px;padding-left:50px"></td>
     </tr>
     </table>
 </div>
     </div>
 
-
 </body>
 </html>
