diff --git a/html/themes/breezy/less/login.less b/html/themes/breezy/less/login.less
index 78d9cde0abade31b2971bde18640dcec47badf89..cf592fedb2b2881a0a6bcd6d3dd22dc72f4de995 100644
--- a/html/themes/breezy/less/login.less
+++ b/html/themes/breezy/less/login.less
@@ -27,6 +27,7 @@ div#window-container {
 div#window-div {
   min-width: 50%;
   margin-top: 100px;
+  margin-bottom: 30px;
   border: 1px solid @border-color-1;
   background-color: @background-second-color;
   display: inline-block;
diff --git a/html/themes/breezy/login.css b/html/themes/breezy/login.css
index e4bf9e079a03682a445fd15213c4c7532f346821..93115953ae62dcde38a155a9d1de68547c24779d 100644
--- a/html/themes/breezy/login.css
+++ b/html/themes/breezy/login.css
@@ -25,6 +25,7 @@ div#window-container {
 div#window-div {
   min-width: 50%;
   margin-top: 100px;
+  margin-bottom: 30px;
   border: 1px solid #c0c2c3;
   background-color: #f3f4f4;
   display: inline-block;
diff --git a/include/class_template.inc b/include/class_template.inc
index f3a01461c81bf8bbc72d0958b72a5653d0fb387d..f589585fdf3daa8a77b69b3b3428d616167cbd60 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -96,6 +96,10 @@ class template
             $this->attributes[$class][] = $attr;
           }
         }
+        if (empty($this->attributes[$class]) && $tab->ignore_account) {
+          // Do not show empty sections for tabs which are not explicitely enabled
+          unset($this->attributes[$class]);
+        }
       }
     }
   }