diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 488ab9a4d..45377f3c6 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -127,13 +127,6 @@
 		text-align: left;
 	}
 
-	.loginAfter {
-		display: inline-block;
-		height: 90%;
-		vertical-align: middle;
-		width: 0;
-	}
-
 	.flag-selector {
 		margin-bottom: 0;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 4dc32b2ca..eb4eeaedf 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -2395,9 +2395,6 @@ class Actions
 
 	public function ProcessTemplate(string $sName, string $sHtml): string
 	{
-		$sHtml = $this->Plugins()->ProcessTemplate($sName, $sHtml);
-		$sHtml = \preg_replace('/\{\{INCLUDE\/([a-zA-Z]+)\/PLACE\}\}/', '', $sHtml);
-
 		$sHtml = \preg_replace('/<script/i', '<x-script', $sHtml);
 		$sHtml = \preg_replace('/<\/script>/i', '</x-script>', $sHtml);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index 10537fddf..4096e22a9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -560,25 +560,6 @@ class Manager
 		return $this;
 	}
 
-	public function ProcessTemplate(string $sName, string $sHtml) : string
-	{
-		if (isset($this->aProcessTemplate[$sName]))
-		{
-			foreach ($this->aProcessTemplate[$sName] as $sPlace => $aAddHtml)
-			{
-				if (\is_array($aAddHtml) && 0 < \count($aAddHtml))
-				{
-					foreach ($aAddHtml as $sAddHtml)
-					{
-						$sHtml = \str_replace('{{INCLUDE/'.$sPlace.'/PLACE}}', $sAddHtml.'{{INCLUDE/'.$sPlace.'/PLACE}}', $sHtml);
-					}
-				}
-			}
-		}
-
-		return $sHtml;
-	}
-
 	public function bIsEnabled() : bool
 	{
 		return $this->bIsEnabled;
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index e8f191b09..169fbaeae 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -42,6 +42,5 @@
 			</div>
 		</center>
 	</div>
-	<div class="loginAfter"></div>
 <div>
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index c1a19e44d..b81439c54 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -16,7 +16,6 @@
 				</div>
 				<form class="wrapper submitting-pane loginForm thm-login thm-login-text" action="#/"
 					data-bind="submit: submitForm, css: {'errorAnimated': formError, 'welcome-off': welcome, 'submitting': submitRequest()}">
-					{{INCLUDE/TopControlGroup/PLACE}}
 					<div class="controls plugin-mark-Login-TopControlGroup"
 						data-bind="css: {'error': emailError, 'animated': emailErrorAnimation}">
 						<div class="input-append">
@@ -69,7 +68,6 @@
 							}
 						}"></div>
 					</div>
-					{{INCLUDE/BottomControlGroup/PLACE}}
 					<div class="controls controls-submit-wrp" data-bind="hidden: hideSubmitButton">
 						<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">
 							<span class="i18n i18n-animation" data-i18n="LOGIN/BUTTON_SIGN_IN"></span>
@@ -127,9 +125,6 @@
 					</a>
 				</span>
 			</div>
-			{{INCLUDE/BottomFooter/PLACE}}
 		</center>
 	</div>
-	<a href="#" onclick="return false;"></a>
-	<div class="loginAfter"></div>
 </div>