diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 427c5418f..e83228719 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -161,7 +161,7 @@
   <!-- Local link to system jQuery -->
   <script type="text/javascript" src="{% static 'theme/js/libs/jquery.min.js' %}"></script>
   <!-- Local link to system Bootstrap JS -->
-  <script type="text/javascript" src="{% static 'theme/bootstrap-3.2.0/js/bootstrap.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'theme/bootstrap/js/bootstrap.min.js' %}"></script>
 
   {% block js_block %}
     {{ js|safe }}
diff --git a/plinth/templates/login.html b/plinth/templates/login.html
index 91ac6ed4c..7ae2a39be 100644
--- a/plinth/templates/login.html
+++ b/plinth/templates/login.html
@@ -23,9 +23,13 @@
 {% block main_block %}
 
   <form class="form" method="post">
-    {% csrf_token %}
 
-    {{ form|bootstrap }}
+    <div class="row">
+      {% csrf_token %}
+      <div class="col-sm-4">
+        {{ form|bootstrap }}
+      </div>
+    </div>
 
     <input type="submit" class="btn-primary" value="Login" />
     <input type="hidden" name="next" value="{{ next }}" />