diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 5d7a107e4..ea822e6b9 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -95,13 +95,13 @@
               <span class="glyphicon-question-sign glyphicon nav-icon"></span>
             </a>
           </li>
+          {% if user.is_authenticated %}
           <li>
             <a href="{% url 'system:index' %}">
               <span class="glyphicon-cog glyphicon nav-icon"></span>
             </a>
           </li>
           <li class="dropdown">
-            {% if user.is_authenticated %}
               <a href="{% url 'users:edit' user.username %}"
                  class="dropdown-toggle" data-toggle="dropdown"
                  role="button" aria-expanded="false">
@@ -117,12 +117,15 @@
                 <li><a href="{% url 'users:logout' %}" title="Log out">
                     Log out</a></li>
               </ul>
-            {% else %}
+          </li>
+          {% else %}
+          <li>
               <a href="{% url 'users:login' %}" title="Log in">
                 <i class="glyphicon glyphicon-user nav-icon"></i>
                 Log in</a>
-            {% endif %}
-          </li>
+          </li>  
+          {% endif %}
+
           {% if user.is_authenticated %}
             <li id="logout-nojs">
               <a href="{% url 'users:logout' %}" title="Log out">
diff --git a/plinth/templates/login.html b/plinth/templates/login.html
index ddd28b592..00486dca6 100644
--- a/plinth/templates/login.html
+++ b/plinth/templates/login.html
@@ -26,12 +26,14 @@
 
     <div class="row">
       {% csrf_token %}
-      <div class="col-sm-4">
+      <div class="col-sm-4 col-md-offset-2">
         {{ form|bootstrap }}
-      </div>
+        <div class="text-center">
+        <input type="submit" class="btn btn-primary" value="Login" />
+        </div>
+     </div>
     </div>
 
-    <input type="submit" class="btn btn-primary" value="Login" />
     <input type="hidden" name="next" value="{{ next }}" />
   </form>