diff --git a/euscanwww/djeuscan/templates/_base.html b/euscanwww/djeuscan/templates/_base.html
index 54ea007..da71b71 100644
--- a/euscanwww/djeuscan/templates/_base.html
+++ b/euscanwww/djeuscan/templates/_base.html
@@ -50,7 +50,7 @@
                 </ul>
                 <li><a href="{% url "django.contrib.auth.views.logout" %}">Logout</a></li>
               {% else %}
-              <li><a href="{% url "django.contrib.auth.views.login" %}?next={% url "accounts_index" %}">Login</a></li>
+                <li><a href="{% url "django.contrib.auth.views.login" %}?next={% url "accounts_index" %}">Login</a></li>
                 <li><a href="{% url "registration.views.register" %}">Register</a></li>
               {% endif %}
 
diff --git a/euscanwww/djeuscan/templates/registration/login.html b/euscanwww/djeuscan/templates/registration/login.html
index d2e3547..eaa7c54 100644
--- a/euscanwww/djeuscan/templates/registration/login.html
+++ b/euscanwww/djeuscan/templates/registration/login.html
@@ -12,17 +12,24 @@
     {% csrf_token %}
     <table>
       <tr>
-        <td>{{ form.username.label_tag }}</td>
+        <th>{{ form.username.label_tag }}</th>
         <td>{{ form.username }}</td>
       </tr>
       <tr>
-        <td>{{ form.password.label_tag }}</td>
+        <th>{{ form.password.label_tag }}</th>
         <td>{{ form.password }}</td>
       </tr>
+      <tr>
+        <td></td>
+        <td>
+          <input type="submit" value="Login" />
+        </td>
+      </tr>
     </table>
-
-    <input type="submit" value="login" />
     <input type="hidden" name="next" value="/" />
   </form>
 
+  <a href="{% url "registration.views.register" %}">Register</a>
+  <a href="{% url "django.contrib.auth.views.password_reset" %}">Forgot password</a>
+
 {% endblock %}