diff --git a/include/enotify.php b/include/enotify.php
index 99bc0fd324..4327e75b83 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -23,12 +23,15 @@ function notification($params) {
 	$site_admin = sprintf( t('%s Administrator'), $sitename);
 	$nickname = "";
 
-	$sender_name = $product;
+	$sender_name = $sitename;
 	$hostname = $a->get_hostname();
 	if(strpos($hostname,':'))
 		$hostname = substr($hostname,0,strpos($hostname,':'));
-
-	$sender_email = t('noreply') . '@' . $hostname;
+	
+	$sender_email = $a->config['sender_email'];
+	if (empty($sender_email)) {
+		$sender_email = t('noreply') . '@' . $hostname;
+	}
 
 	$user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid']));
 	if ($user)
diff --git a/mod/admin.php b/mod/admin.php
index bf74d3ef3c..e75ec45399 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -278,7 +278,7 @@ function admin_page_site_post(&$a){
 			$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
 			$r = q($q);
 			if (!$r) {
-				notice( "Falied updating '$table_name': " . $db->error );
+				notice( "Failed updating '$table_name': " . $db->error );
 				goaway($a->get_baseurl(true) . '/admin/site' );
 			}
 		}
@@ -309,6 +309,7 @@ function admin_page_site_post(&$a){
 
 	$sitename 		=	((x($_POST,'sitename'))			? notags(trim($_POST['sitename']))		: '');
 	$hostname 		=	((x($_POST,'hostname'))			? notags(trim($_POST['hostname']))		: '');
+	$sender_email	=	((x($_POST,'sender_email'))		? notags(trim($_POST['sender_email']))		: '');
 	$banner			=	((x($_POST,'banner'))      		? trim($_POST['banner'])			: false);
 	$info			=	((x($_POST,'info'))      		? trim($_POST['info'])			: false);
 	$language		=	((x($_POST,'language'))			? notags(trim($_POST['language']))		: '');
@@ -415,6 +416,7 @@ function admin_page_site_post(&$a){
 	set_config('system','maxloadavg',$maxloadavg);
 	set_config('config','sitename',$sitename);
 	set_config('config','hostname',$hostname);
+	set_config('config','sender_email', $sender_email);
 	set_config('system','suppress_language',$suppress_language);
 	if ($banner==""){
 		// don't know why, but del_config doesn't work...
@@ -605,6 +607,7 @@ function admin_page_site(&$a) {
 		// name, label, value, help string, extra data...
 		'$sitename' 		=> array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'),
 		'$hostname' 		=> array('hostname', t("Host name"), $a->config['hostname'], ""),
+		'$sender_email'		=> array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from.", "", "", "email"),
 		'$banner'		=> array('banner', t("Banner/Logo"), $banner, ""),
 		'$info'	=> array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')),
 		'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 166b35e7d4..24ff751bea 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -46,6 +46,7 @@
 
 	{{include file="field_input.tpl" field=$sitename}}
 	{{include file="field_input.tpl" field=$hostname}}
+	{{include file="field_input.tpl" field=$sender_email}}
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$info}}
 	{{include file="field_select.tpl" field=$language}}