diff --git a/include/items.php b/include/items.php
index 133d1299b3..483540f46a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1061,7 +1061,7 @@ function new_follower($importer,$contact,$datarray,$item) {
 				$res = mail($r[0]['email'], 
 					t("You have a new follower at ") . $a->config['sitename'],
 					$email,
-					'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
+					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
 			
 			}
 		}
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index a7296fec03..8c259f231a 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -441,7 +441,7 @@ function dfrn_request_content(&$a) {
 					$res = mail($r[0]['email'], 
 						t("Introduction received at ") . $a->config['sitename'],
 						$email,
-						'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
+						'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
 					// This is a redundant notification - no point throwing errors if it fails.
 				}
 				if($auto_confirm) {
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 0b5dc1376b..30bdc059c3 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -35,9 +35,8 @@ function lostpass_post(&$a) {
 			'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
 	));
 
-	$res = mail($email,"Password reset requested at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
-
-	
+	$res = mail($email, t('Password reset requested at ') . $a->config['sitename'],
+			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]);
 
 	goaway($a->get_baseurl());
 }
diff --git a/mod/register.php b/mod/register.php
index 5fdb629b52..99823f4513 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -195,7 +195,7 @@ function register_post(&$a) {
 				'$uid' => $newuid ));
 
 		$res = mail($email, t('Registration details for ') . $a->config['sitename'],
-			$email_tpl, 'From: ' . t('Administrator@') . $_SERVER['SERVER_NAME']);
+			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
 
 		if($res) {
@@ -232,7 +232,7 @@ function register_post(&$a) {
 		 ));
 
 		$res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
-			$email_tpl,'From: ' .  t('Administrator@') . $_SERVER[SERVER_NAME]);
+			$email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
 		if($res) {
 			notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
diff --git a/mod/regmod.php b/mod/regmod.php
index 932b109ebc..772351ac55 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -15,7 +15,7 @@ function regmod_content(&$a) {
 	if($a->argc != 3)
 		killme();
 
-	$cmd = $a->argv[1];
+	$cmd  = $a->argv[1];
 	$hash = $a->argv[2];
 
 
@@ -76,7 +76,7 @@ function regmod_content(&$a) {
 		));
 
 		$res = mail($user[0]['email'], t('Registration details for '). $a->config['sitename'],
-			$email_tpl,'From: ' . t('Administrator@') . $_SERVER[SERVER_NAME] );
+			$email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
 
 		if($res) {
 			notice( t('Account approved.') . EOL );