diff --git a/cms/sass/components/_buttons.scss b/cms/sass/components/_buttons.scss
index 061c75c454..1d28038f01 100644
--- a/cms/sass/components/_buttons.scss
+++ b/cms/sass/components/_buttons.scss
@@ -124,3 +124,14 @@ button.aria-button {
     -moz-appearance: none;
     appearance: none;
 }
+
+.user-actions {
+  display: flex;
+  align-items: center;
+
+  .user-item {
+    form {
+      margin: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/portality/templates-v2/management/base.html b/portality/templates-v2/management/base.html
index a47c4cea80..50ac330eb0 100644
--- a/portality/templates-v2/management/base.html
+++ b/portality/templates-v2/management/base.html
@@ -174,18 +174,27 @@ <h1>
         {% include "includes/_flash_notification.html" %}
         {% block management_content %}{% endblock %}
 
-        <p>
-            <small>
-                <a href="{{ url_for('account.logout') }}" class="tag" id="logout">
-                    <span data-feather="log-out" aria-hidden="true"></span>
-                    Log out
-                </a>
-                <a href="{{ url_for('account.username', username=current_user.id) }}" class="tag">
-                    <span data-feather="settings" aria-hidden="true"></span>
-                    Settings
-                </a>
-            </small>
-        </p>
+        <section class="user-actions">
+            <div class="user-item">
+                <form method="POST" action="{{ url_for('account.logout') }}">
+                    <small>
+                        <button type="submit" id="logout" class="tag">
+                            Logout
+                            <span data-feather="log-out" aria-hidden="true"></span>
+                        </button>
+                    </small>
+                </form>
+            </div>
+
+            <div class="user-item">
+                <small>
+                    <a href="{{ url_for('account.username', username=current_user.id) }}" class="tag">
+                        <span data-feather="settings" aria-hidden="true"></span>
+                        Settings
+                    </a>
+                </small>
+            </div>
+        </section>
     </main>
     {% include "includes/_back-to-top.html" %}