diff --git a/e107_core/templates/login_template.php b/e107_core/templates/login_template.php
index bf59fd9c7..5f30448da 100644
--- a/e107_core/templates/login_template.php
+++ b/e107_core/templates/login_template.php
@@ -89,7 +89,7 @@ $LOGIN_TEMPLATE['page']['header'] = "
 		</div>";
 
 $LOGIN_TEMPLATE['page']['body'] = '
-
+		{LOGIN_TABLE_LOGINMESSAGE}
         <h2 class="form-signin-heading">'.LAN_LOGIN_4.'</h2>';
 	if (e107::pref('core', 'password_CHAP') == 2)
 	{
@@ -110,6 +110,9 @@ $LOGIN_WRAPPER['page']['LOGIN_TABLE_SECIMG_TEXTBOC'] = "<div class='form-group'>
 $LOGIN_WRAPPER['page']['LOGIN_TABLE_REMEMBERME'] = "<div class='form-group checkbox'>{---}</div>";
 $LOGIN_WRAPPER['page']['LOGIN_TABLE_SUBMIT'] = "<div class='form-group'>{---}</div>";
 $LOGIN_WRAPPER['page']['LOGIN_TABLE_FOOTER_USERREG'] = "<div class='form-group'>{---}</div>";
+$LOGIN_WRAPPER['page']['LOGIN_TABLE_LOGINMESSAGE'] = "<div class='alert alert-danger'>{---}</div>";
+
+
 // $LOGIN_WRAPPER['page']['LOGIN_TABLE_FPW_LINK'] = "<div class='form-group'>{---}</div>";
 
 $LOGIN_TEMPLATE['page']['body'] .= '
diff --git a/login.php b/login.php
index 12fed7e6c..898a599a9 100644
--- a/login.php
+++ b/login.php
@@ -101,7 +101,11 @@ if (!USER || getperms('0'))
 	
 
 	$login_message = SITENAME; //	$login_message = LAN_LOGIN_3." | ".SITENAME;
-	echo LOGINMESSAGE;
+	if(strpos($LOGIN_TABLE_HEADER,'LOGIN_TABLE_LOGINMESSAGE') === false && strpos($LOGIN_TABLE,'LOGIN_TABLE_LOGINMESSAGE') === false)
+	{
+		echo LOGINMESSAGE;
+	}
+
 	echo $tp->parseTemplate($LOGIN_TABLE_HEADER,true, $sc);
 	$ns->tablerender($login_message, $text, 'login_page');
 	echo $tp->parseTemplate($LOGIN_TABLE_FOOTER, true, $sc);