diff --git a/guacamole/src/main/webapp/app/index/styles/headers.css b/guacamole/src/main/webapp/app/index/styles/headers.css
index 2e813f42f..b4d96f66b 100644
--- a/guacamole/src/main/webapp/app/index/styles/headers.css
+++ b/guacamole/src/main/webapp/app/index/styles/headers.css
@@ -74,6 +74,10 @@ h2 {
 
 }
 
+.header.tabbed {
+    margin-bottom: 0;
+}
+
 .header ~ * .header,
 .header ~ .header {
     margin-top: 1em;
diff --git a/guacamole/src/main/webapp/app/manage/styles/manage-user.css b/guacamole/src/main/webapp/app/manage/styles/manage-user.css
index cc0cd5ccb..d54c6b391 100644
--- a/guacamole/src/main/webapp/app/manage/styles/manage-user.css
+++ b/guacamole/src/main/webapp/app/manage/styles/manage-user.css
@@ -17,10 +17,6 @@
  * under the License.
  */
 
-.manage-user .username.header {
-    margin-bottom: 0;
-}
-
 .manage-user .page-tabs .page-list li.read-only a[href],
 .manage-user .page-tabs .page-list li.unlinked  a[href],
 .manage-user .page-tabs .page-list li.linked    a[href] {
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
index 660554b2a..bb5cfb388 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
@@ -2,7 +2,7 @@
 <div class="manage-user view" ng-class="{loading: !isLoaded()}">
 
     <!-- User header and data source tabs -->
-    <div class="username header">
+    <div class="header tabbed">
         <h2>{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}</h2>
         <guac-user-menu></guac-user-menu>
     </div>
diff --git a/guacamole/src/main/webapp/app/settings/styles/settings.css b/guacamole/src/main/webapp/app/settings/styles/settings.css
index ee59cae8e..390a79318 100644
--- a/guacamole/src/main/webapp/app/settings/styles/settings.css
+++ b/guacamole/src/main/webapp/app/settings/styles/settings.css
@@ -17,10 +17,6 @@
  * under the License.
  */
 
-.settings .header {
-    margin-bottom: 0;
-}
-
 .settings table.properties th {
     text-align: left;
     font-weight: normal;
diff --git a/guacamole/src/main/webapp/app/settings/templates/settings.html b/guacamole/src/main/webapp/app/settings/templates/settings.html
index eec1f9799..b29d809c8 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settings.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settings.html
@@ -1,7 +1,7 @@
 
 <div class="view">
 
-    <div class="header">
+    <div class="header tabbed">
         <h2>{{'SETTINGS.SECTION_HEADER_SETTINGS' | translate}}</h2>
         <guac-user-menu></guac-user-menu>
     </div>