diff --git a/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco b/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco
index 42f9c2da0..ec428eb15 100644
--- a/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/admin_loading.jst.eco
@@ -83,14 +83,11 @@
     
   </ul>
   <div class="tab-content">
-    <div class="tab-pane active" id="c-account">
-      <h2>Email</h2>
+    <div class="tab-pane active" id="c-account"></div>
+  </div>
 
-      <div class="action action--loading">
-        <div class="small loading icon"></div>
-        <div class="action-loading-label">Collecting Email Settings..</div>
-      </div>
-
-    </div>
+  <div class="page-loading">
+    <div class="small loading icon"></div>
+    <div class="page-loading-label">Loading Email Settings</div>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index a1bbedb71..b98ce3df1 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1632,6 +1632,19 @@ kbd {
   }
 }
 
+
+.page-loading {
+  min-height: 500px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+  
+.page-loading-label {
+  margin-left: 10px;
+  margin-top: 1px;
+}
+
 .dropdown-menu .count {
   padding-top: 1px;
   margin-left: 10px;
@@ -6415,16 +6428,6 @@ output {
     }
   }
 
-  &.action--loading {
-    min-height: 300px;
-    align-items: center;
-    justify-content: center;
-    
-    .action-loading-label {
-      margin-left: 10px;
-    }
-  }
-
   .action-flow {
     display: flex;
     flex-wrap: wrap;