diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html
index 4137f6598..c8c7d776c 100644
--- a/plinth/modules/users/templates/users_list.html
+++ b/plinth/modules/users/templates/users_list.html
@@ -33,18 +33,18 @@
   </style>
 {% endblock %}
 
-{% block status %}
-  <a href="{% url 'users:create' %}" class="btn btn-primary"
-     role="button" title="{% trans 'Create User' %}">
-    <span class="fa fa-plus" aria-hidden="true"></span>
-    {% trans 'Create User' %}
-  </a>
-{% endblock %}
-
 {% block configuration %}
 
   <h3>{% trans "Users" %}</h3>
 
+  <div class="btn-toolbar">
+    <a href="{% url 'users:create' %}" class="btn btn-primary"
+       role="button" title="{% trans 'Create User' %}">
+      <span class="fa fa-plus" aria-hidden="true"></span>
+      {% trans 'Create User' %}
+    </a>
+  </div>
+
   <div class="row">
     <div class="col-sm-6">
       <div class="list-group">