diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index 304e666d0..6e5a6cd85 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -211,7 +211,11 @@ if((isset($_POST['chat_submit']) || e_AJAX_REQUEST) && $_POST['cmessage'] != '')
 if(!USER && !$pref['anon_post']){
 	if($pref['user_reg'])
 	{
-		$texta = "<div style='text-align:center'>".CHATBOX_L3."</div><br /><br />";
+		$text1 = str_replace(array('[',']'), array("<a href='".e_LOGIN."'>", "</a>"), CHATBOX_L3);
+		if($pref['user_reg'] == 1 ){
+		  $text1 .= str_replace(array('[',']'), array("<a href='".e_SIGNUP."'>", "</a>"), CHATBOX_L3b);		
+		}
+		$texta = "<div style='text-align:center'>".$text1."</div><br /><br />";
 	}
 }
 else
diff --git a/e107_plugins/chatbox_menu/languages/English/English.php b/e107_plugins/chatbox_menu/languages/English/English.php
index 5b01d36bf..950976f07 100644
--- a/e107_plugins/chatbox_menu/languages/English/English.php
+++ b/e107_plugins/chatbox_menu/languages/English/English.php
@@ -16,7 +16,8 @@
 
 define("CHATBOX_L1", "Unable to accept post as that username is registered - if it is your username please login to post.");
 // define("CHATBOX_L2", "Chatbox");
-define("CHATBOX_L3", "You must be logged in to post comments on this site - please either log in or if you are not registered click <a href='".e_SIGNUP."'>here</a> to signup");
+define("CHATBOX_L3", "You must be logged in to post comments on this site - please either log in from the Login box or from [here].");
+define("CHATBOX_L3b", "If you are not registered click [here] to signup. ");
 define("CHATBOX_L4", "Post new message");
 define("CHATBOX_L5", "Reset");
 define("CHATBOX_L6", "[blocked by admin]");
diff --git a/signup.php b/signup.php
index a980c578c..58009386b 100644
--- a/signup.php
+++ b/signup.php
@@ -976,7 +976,7 @@ if (isset($_POST['register']) && intval($pref['user_reg']) === 1)
 			else
 			{
 				$text = LAN_SIGNUP_76."&nbsp;".SITENAME.", ".LAN_SIGNUP_12."<br /><br />";
-				$text .= str_replace(array('[',']'), array("<a href='".e_BASE."login.php'>", "</a>"), LAN_SIGNUP_13);
+				$text .= str_replace(array('[',']'), array("<a href='".e_LOGIN."'>", "</a>"), LAN_SIGNUP_13);
 			}
 			
 			$ns->tablerender(LAN_SIGNUP_8,$text);