diff --git a/core/static/core/form.css b/core/static/core/form.css
index 007f1cbb..83b926f7 100644
--- a/core/static/core/form.css
+++ b/core/static/core/form.css
@@ -9,8 +9,8 @@ button,
 textarea
 {
     margin: 0;
-    border: 0;
-    padding: 0;
+    border: 1px solid;
+    padding: 4px;
     display: inline-block;
     vertical-align: middle;
     white-space: normal;
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 33edbbdc..9e99bc1a 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -16,8 +16,8 @@
     {% block header %}
     <header>
         {% if not user.is_authenticated() %}
-            <a href="{{ url('core:register') }}">Register</a> |
-            <a href="{{ url('core:login') }}">Login</a>
+            <a href="{{ url('core:login') }}">Login</a> |
+            <a href="{{ url('core:register') }}">Register</a>
         {% else %}
             <a href="{{ url('core:user_profile', user_id=user.id) }}">{{ user.get_display_name() }}</a> |
             <a href="{{ url('core:user_tools') }}">Tools</a> |