diff --git a/e107_admin/users.php b/e107_admin/users.php
index 60efeaa55..2aaf41cd9 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -9,9 +9,9 @@
 * Administration Area - Users
 *
 * $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
-* $Revision: 1.35 $
-* $Date: 2009-06-24 20:10:32 $
-* $Author: e107coders $
+* $Revision: 1.36 $
+* $Date: 2009-07-06 07:50:44 $
+* $Author: marj_nl_fr $
 *
 */
 require_once('../class2.php');
@@ -1227,7 +1227,7 @@ class users
 
 		$return_address = (substr(SITEURL, -1) == "/") ? SITEURL."signup.php?activate.".$id.".".$key : SITEURL."/signup.php?activate.".$id.".".$key;
 
-		$message = LAN_EMAIL_01." ".$name."\n\n".LAN_SIGNUP_24." ".SITENAME.".\n".LAN_SIGNUP_21."...\n\n";
+		$message = LAN_EMAIL_01." ".$name."\n\n".LAN_SIGNUP_24." ".SITENAME.".\n".LAN_SIGNUP_21."\n\n";
 		$message .= $return_address . "\n\n".SITENAME."\n".SITEURL;
 
 		$mailheader_e107id = $id;
diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php
index 3cadf9792..8cb22aedd 100644
--- a/e107_languages/English/lan_signup.php
+++ b/e107_languages/English/lan_signup.php
@@ -9,9 +9,9 @@
  * Language file - User signup
  *
  * $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_signup.php,v $
- * $Revision: 1.18 $
- * $Date: 2009-06-12 20:41:34 $
- * $Author: e107steved $
+ * $Revision: 1.19 $
+ * $Date: 2009-07-06 07:50:44 $
+ * $Author: marj_nl_fr $
  *
 */
 define("PAGE_NAME", "Register");
@@ -56,10 +56,10 @@ define("LAN_SIGNUP_14", "here");
 define("LAN_SIGNUP_15", "Please contact the main site admin");
 define("LAN_SIGNUP_16", "if you require assistance.");
 define("LAN_SIGNUP_17", "Please certify you are 13 or over the age of 13.");
-define("LAN_SIGNUP_18", "Your registration has been received and created with the following login information ...");
-define("LAN_SIGNUP_19", "Username:");
-define("LAN_SIGNUP_20", "Password:");
-define("LAN_SIGNUP_21", "Your account is currently marked as being inactive, to activate your account please go to the following link ...");
+define("LAN_SIGNUP_18", "Your registration has been received and created with the following login information:");
+//define("LAN_SIGNUP_19", "Username:"); // now LAN_LOGINNAME
+//define("LAN_SIGNUP_20", "Password:"); // now LAN_PASSWORD
+define("LAN_SIGNUP_21", "Your account is currently marked as being inactive. To activate your account please go to the following link:");
 define("LAN_SIGNUP_22", "click here");
 define("LAN_SIGNUP_23", "to login.");
 define("LAN_SIGNUP_24", "Thank you for registering at");
diff --git a/e107_themes/templates/email_template.php b/e107_themes/templates/email_template.php
index 718407fa1..eb322e5f9 100644
--- a/e107_themes/templates/email_template.php
+++ b/e107_themes/templates/email_template.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/email_template.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-12-21 22:17:05 $
-|     $Author: e107steved $
+|     $Revision: 1.6 $
+|     $Date: 2009-07-06 07:50:44 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -65,13 +65,13 @@ $SIGNUPEMAIL_TEMPLATE = "
 ".LAN_EMAIL_01." {USERNAME},<br />
 <br />".
 LAN_SIGNUP_97." {SITENAME}<br />
-".LAN_SIGNUP_21.":<br />
+".LAN_SIGNUP_21."<br />
 <br />
 {ACTIVATION_LINK}<br />
 <br />
 ".LAN_SIGNUP_59."<br />
 <br />
-".LAN_SIGNUP_18.":<br />
+".LAN_SIGNUP_18."<br />
 <br />
 ".LAN_LOGINNAME.": <b> {LOGINNAME} </b><br />
 ".LAN_PASSWORD.": <b> {PASSWORD} </b><br />
@@ -93,4 +93,4 @@ LAN_SIGNUP_97." {SITENAME}<br />
 
 
 
-?>
+?>
\ No newline at end of file