diff --git a/forms/common-themes/src/main/resources/theme/login/base/error.ftl b/forms/common-themes/src/main/resources/theme/login/base/error.ftl
index 220d2d8954..ca5a65dec1 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/error.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/error.ftl
@@ -1,6 +1,6 @@
 <#-- TODO: Only a placeholder, implementation needed -->
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.errorTitle}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
index f978824246..facbf26968 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.loginTotpTitle}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-reset-password.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-reset-password.ftl
index 34aec1ef69..9bf880193d 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-reset-password.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-reset-password.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.emailForgotHeader}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-totp.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-totp.ftl
index 1fecd2ce8f..3a50abcd06 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-totp.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-totp.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
 
     <#if section = "title">
     ${rb.loginTitle} ${realm.name}
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl
index 0233e6b0af..4172edcff4 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.emailUpdateHeader}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl
index 37ff4ca72c..ee77a9e2f6 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.loginProfileTitle}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-username-reminder.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-username-reminder.ftl
index 022b6e4f1a..bc558ce572 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-username-reminder.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-username-reminder.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass=""; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.emailUsernameForgotHeader}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl
index 75f0155fb7..e326e2a8cd 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass="email"; section>
+<@layout.registrationLayout; section>
     <#if section = "title">
     ${rb.emailVerifyTitle}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/login.ftl b/forms/common-themes/src/main/resources/theme/login/base/login.ftl
index 09dc8b70f2..1d769559db 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login.ftl
@@ -1,6 +1,6 @@
 <#ftl strip_whitespace=true strip_text=true>
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass="" displaySocial=social.displaySocialProviders; section>
+<@layout.registrationLayout displaySocial=social.displaySocialProviders displaySeparator=realm.registrationAllowed; section>
     <#if section = "title">${rb.loginTitle} ${realm.name}
 
     <#elseif section = "header">
diff --git a/forms/common-themes/src/main/resources/theme/login/base/register.ftl b/forms/common-themes/src/main/resources/theme/login/base/register.ftl
index 5438ebeb7f..2c8cc40ae1 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/register.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/register.ftl
@@ -1,5 +1,5 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout bodyClass="register" ; section>
+<@layout.registrationLayout bodyClass="register" displaySeparator=true; section>
     <#if section = "title">
     ${rb.registerWith} ${realm.name}
 
diff --git a/forms/common-themes/src/main/resources/theme/login/base/template.ftl b/forms/common-themes/src/main/resources/theme/login/base/template.ftl
index 55d577280a..e3d0e27726 100644
--- a/forms/common-themes/src/main/resources/theme/login/base/template.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/template.ftl
@@ -1,4 +1,4 @@
-<#macro registrationLayout bodyClass isSeparator=false forceSeparator=false displaySocial=false>
+<#macro registrationLayout bodyClass="" displaySeparator=false displaySocial=false>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
@@ -23,12 +23,7 @@
     <div class="content">
         <h2 id="kc-header"><#nested "header"></h2>
         <div class="background-area">
-            <#if !forceSeparator && realm?has_content>
-                <#assign drawSeparator = realm.registrationAllowed>
-            <#else>
-                <#assign drawSeparator = isSeparator>
-            </#if>
-            <div class="form-area ${displaySocial?string('social','')} ${(drawSeparator)?string('separator','')} clearfix">
+            <div class="form-area ${displaySocial?string('social','')} ${displaySeparator?string('separator','')} clearfix">
                 <div class="section app-form">
                     <#if message?has_content>
                         <div class="feedback ${message.type} bottom-left show">