diff --git a/e107_handlers/login.php b/e107_handlers/login.php
index 8d2f47fb5..1dc8a5261 100644
--- a/e107_handlers/login.php
+++ b/e107_handlers/login.php
@@ -579,9 +579,16 @@ class userlogin
 				$this->logNote('LAN_ROLL_LOG_02', $username);
 				break;
 			case LOGIN_NOT_ACTIVATED :
-				$srch = array("[", "]");
-				$repl = array("<a href='" . e_HTTP . "signup.php?resend'>", "</a>");
-				$message = str_replace($srch, $repl, LAN_LOGIN_22);
+				if($pref['user_reg_veri'] == 2)
+				{
+					$message = LAN_LOGIN_37;
+				}
+				else
+				{
+					$srch = array("[", "]");
+					$repl = array("<a href='" . e_HTTP . "signup.php?resend'>", "</a>");
+					$message = str_replace($srch, $repl, LAN_LOGIN_22);
+				}
 				$this->logNote('LAN_ROLL_LOG_05', $username);
 				$this->genNote($username, LAN_LOGIN_27);
 				$doCheck = true;
@@ -674,4 +681,4 @@ class userlogin
 	}
 
 
-}
+}
\ No newline at end of file
diff --git a/e107_languages/English/lan_login.php b/e107_languages/English/lan_login.php
index 952811dbe..e96642161 100644
--- a/e107_languages/English/lan_login.php
+++ b/e107_languages/English/lan_login.php
@@ -45,4 +45,4 @@ define("LAN_LOGIN_33", "[Return to the homepage]"); // the [ ] brackets are repl
 define("LAN_LOGIN_34", "User registration and/or login is currently disabled.");
 define("LAN_LOGIN_35", "[Enable it]"); // the [ ] brackets are replaced with a button link
 define("LAN_LOGIN_36", "Emails to [x] are bouncing back. Please [verify your email address is correct].");// the [ ] brackets are replaced with a button link to usersettings.php
-?>
+define("LAN_LOGIN_37", "Your account has not been activated by a Site Administrator yet."); // Similar to LAN_LOGIN_22 but used in case verification method is set to 'Admin Approval'
\ No newline at end of file