diff --git a/application/loginform.class.inc.php b/application/loginform.class.inc.php
index c42e4a69b..ef9557938 100644
--- a/application/loginform.class.inc.php
+++ b/application/loginform.class.inc.php
@@ -121,18 +121,17 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 			'sAuthUser' => $sAuthUser,
 			'sAuthPwd' => $sAuthPwd,
 		);
-		$oLoginContext->AddBlockExtension('login_input', new LoginBlockExtension('loginforminput.html.twig', $aData));
-		$oLoginContext->AddBlockExtension('login_submit', new LoginBlockExtension('loginformsubmit.html.twig'));
-		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('loginformfooter.html.twig'));
+		$oLoginContext->AddBlockExtension('login_input', new LoginBlockExtension('extensionblock/loginforminput.html.twig', $aData));
+		$oLoginContext->AddBlockExtension('login_submit', new LoginBlockExtension('extensionblock/loginformsubmit.html.twig'));
+		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
 
 		$bEnableResetPassword = empty(MetaModel::GetConfig()->Get('forgot_password')) ? true : MetaModel::GetConfig()->Get('forgot_password');
 		$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
-
 		$aData = array(
 			'bEnableResetPassword' => $bEnableResetPassword,
 			'sResetPasswordUrl' => $sResetPasswordUrl,
 		);
-		$oLoginContext->AddBlockExtension('login_links', new LoginBlockExtension('loginformlinks.html.twig', $aData));
+		$oLoginContext->AddBlockExtension('login_links', new LoginBlockExtension('extensionblock/loginformlinks.html.twig', $aData));
 
 		return $oLoginContext;
 	}
diff --git a/css/login.css b/css/login.css
index a8c10c24f..bfa310eb8 100644
--- a/css/login.css
+++ b/css/login.css
@@ -4,11 +4,6 @@ html,body {
 	height: 100%;
 }
 
-#login-title {
-	width: 70%;
-	margin-left: 15%;
-}
-
 h1 {
 	color: #1C94C4;
 	font-size: 16pt;
@@ -26,6 +21,11 @@ a:hover {
 	color: #ea7d1e;
 }
 
+#login-title {
+	width: 70%;
+	margin-left: 15%;
+}
+
 #login-body {
 	background: #eee;
 	margin: 0;
@@ -133,6 +133,7 @@ a:hover {
 	border-radius: 0.25em;
 	width: calc(100% - 2em - 4px);
 }
+
 #login-input input:focus {
 	border-color: #A0AEC0;
 }
@@ -160,7 +161,6 @@ a:hover {
 	cursor: pointer;
 }
 
-
 .center {
 	text-align: center;
 }
diff --git a/templates/login/loginformfooter.html.twig b/templates/login/extensionblock/loginformfooter.html.twig
similarity index 100%
rename from templates/login/loginformfooter.html.twig
rename to templates/login/extensionblock/loginformfooter.html.twig
diff --git a/templates/login/loginforminput.html.twig b/templates/login/extensionblock/loginforminput.html.twig
similarity index 100%
rename from templates/login/loginforminput.html.twig
rename to templates/login/extensionblock/loginforminput.html.twig
diff --git a/templates/login/loginformlinks.html.twig b/templates/login/extensionblock/loginformlinks.html.twig
similarity index 100%
rename from templates/login/loginformlinks.html.twig
rename to templates/login/extensionblock/loginformlinks.html.twig
diff --git a/templates/login/loginformsubmit.html.twig b/templates/login/extensionblock/loginformsubmit.html.twig
similarity index 100%
rename from templates/login/loginformsubmit.html.twig
rename to templates/login/extensionblock/loginformsubmit.html.twig