diff --git a/plinth/modules/users/templates/users_change_password.html b/plinth/modules/users/templates/users_change_password.html
index fa2e36e55..6ac0a2b76 100644
--- a/plinth/modules/users/templates/users_change_password.html
+++ b/plinth/modules/users/templates/users_change_password.html
@@ -21,24 +21,20 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block content_row %}
-  <div class="col-md-6 col-md-offset-3">
-    {% include 'messages.html' %}
+{% block content %}
+  <h3>
+    {% blocktrans trimmed with username=form.user.username %}
+      Change Password for <em>{{ username }}</em>
+    {% endblocktrans %}
+  </h3>
+  <form class="form" method="post">
+    {% csrf_token %}
 
-    <h3>
-      {% blocktrans trimmed with username=form.user.username %}
-        Change Password for <em>{{ username }}</em>
-      {% endblocktrans %}
-    </h3>
-    <form class="form" method="post">
-      {% csrf_token %}
+    {{ form|bootstrap }}
 
-      {{ form|bootstrap }}
-
-      <input type="submit" class="btn btn-primary"
-             value="{% trans "Save Password" %}"/>
-    </form>
-  </div>
+    <input type="submit" class="btn btn-primary"
+           value="{% trans "Save Password" %}"/>
+  </form>
 {% endblock %}
 
 {% block page_js %}
diff --git a/plinth/modules/users/templates/users_firstboot.html b/plinth/modules/users/templates/users_firstboot.html
index c58a17e60..cc591e2de 100644
--- a/plinth/modules/users/templates/users_firstboot.html
+++ b/plinth/modules/users/templates/users_firstboot.html
@@ -22,30 +22,25 @@
 {% load i18n %}
 {% load static %}
 
-{% block content_row %}
-  <div class="col-md-6 col-md-offset-3">
-    {% include 'messages.html' %}
+{% block content %}
+  <h2>{% trans "Administrator Account" %}</h2>
 
-    <h2>{% trans "Administrator Account" %}</h2>
+  <p>
+    {% blocktrans trimmed %}
+      Choose a username and password to access this web interface.
+      The password can be changed later. This user will be granted
+      administrative privileges. Other users can be added later.
+    {% endblocktrans %}
+  </p>
 
-    <p>
-      {% blocktrans trimmed %}
-        Choose a username and password to access this web interface.
-        The password can be changed later. This user will be granted
-        administrative privileges. Other users can be added later.
-      {% endblocktrans %}
-    </p>
+  <form class="form" method="post">
+    {% csrf_token %}
 
-    <form class="form" method="post">
-      {% csrf_token %}
+    {{ form|bootstrap }}
 
-      {{ form|bootstrap }}
-
-      <input type="submit" class="btn btn-primary"
-             value="{% trans "Create Account" %}"/>
-    </form>
-
-  </div>
+    <input type="submit" class="btn btn-primary"
+           value="{% trans "Create Account" %}"/>
+  </form>
 {% endblock %}
 
 {% block page_js %}
diff --git a/plinth/modules/users/templates/users_update.html b/plinth/modules/users/templates/users_update.html
index 586e63b0d..c50536815 100644
--- a/plinth/modules/users/templates/users_update.html
+++ b/plinth/modules/users/templates/users_update.html
@@ -21,30 +21,26 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block content_row %}
-  <div class="col-md-6 col-md-offset-3">
-    {% include 'messages.html' %}
+{% block content %}
+  <h3>{{ object.username }}</h3>
 
-    <h3>{{ object.username }}</h3>
+  <p>
+    {% url 'users:change_password' object.username as change_password_url %}
 
-    <p>
-      {% url 'users:change_password' object.username as change_password_url %}
+    {% blocktrans trimmed %}
+      Use the <a href='{{ change_password_url }}'>change password form
+      </a> to change the password.
+    {% endblocktrans %}
+  </p>
 
-      {% blocktrans trimmed %}
-        Use the <a href='{{ change_password_url }}'>change password form
-        </a> to change the password.
-      {% endblocktrans %}
-    </p>
+  <form class="form" method="post">
+    {% csrf_token %}
 
-    <form class="form" method="post">
-      {% csrf_token %}
+    {{ form|bootstrap }}
 
-      {{ form|bootstrap }}
-
-      <input type="submit" class="btn btn-primary"
-             value="{% trans "Save Changes" %}"/>
-    </form>
-  </div>
+    <input type="submit" class="btn btn-primary"
+           value="{% trans "Save Changes" %}"/>
+  </form>
 {% endblock %}
 
 {% block page_js %}