diff --git a/conf/defaults.ini b/conf/defaults.ini
index 95161ac3a3d..d8b53b167ca 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -296,7 +296,7 @@ cert_file =
 key_file =
 skip_verify = false
 from_address = admin@grafana.localhost
-from_name = Grafana Admin
+from_name = Grafana
 
 [emails]
 welcome_email_on_sign_up = false
diff --git a/conf/sample.ini b/conf/sample.ini
index df6b18833e2..969c64cb036 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -282,7 +282,7 @@
 ;key_file =
 ;skip_verify = false
 ;from_address = admin@grafana.localhost
-;from_name = Grafana Admin
+;from_name = Grafana
 
 [emails]
 ;welcome_email_on_sign_up = false
diff --git a/docs/sources/http_api/admin.md b/docs/sources/http_api/admin.md
index 9a77e7fb2a4..950ea4c8202 100644
--- a/docs/sources/http_api/admin.md
+++ b/docs/sources/http_api/admin.md
@@ -158,7 +158,7 @@ with Grafana admin permission.
         "cert_file":"",
         "enabled":"false",
         "from_address":"admin@grafana.localhost",
-        "from_name":"Grafana Admin",
+        "from_name":"Grafana",
         "host":"localhost:25",
         "key_file":"",
         "password":"************",
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 01f805ff175..6805188be05 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -543,7 +543,7 @@ Verify SSL for smtp server? defaults to `false`
 Address used when sending out emails, defaults to `admin@grafana.localhost`
 
 ### from_name
-Name to be used when sending out emails, defaults to `Grafana Admin`
+Name to be used when sending out emails, defaults to `Grafana`
 
 ## [log]
 
diff --git a/pkg/services/notifications/send_email_integration_test.go b/pkg/services/notifications/send_email_integration_test.go
index 7a616b7e40d..a9a5215d3ca 100644
--- a/pkg/services/notifications/send_email_integration_test.go
+++ b/pkg/services/notifications/send_email_integration_test.go
@@ -25,6 +25,8 @@ func TestEmailIntegrationTest(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		addToMailQueue = func(msg *Message) {
+			So(msg.From, ShouldEqual, "Grafana Admin <from@address.com>")
+			So(msg.To[0], ShouldEqual, "asdf@asdf.com")
 			ioutil.WriteFile("../../../tmp/test_email.html", []byte(msg.Body), 0777)
 		}
 
@@ -41,6 +43,7 @@ func TestEmailIntegrationTest(t *testing.T) {
 					"RuleUrl":       "http://localhost:3000/dashboard/db/graphite-dashboard",
 					"ImageLink":     "http://localhost:3000/render/dashboard-solo/db/graphite-dashboard?panelId=1&from=1471008499616&to=1471012099617&width=1000&height=500",
 					"AlertPageUrl":  "http://localhost:3000/alerting",
+					"EmbededImage":  "test.png",
 					"EvalMatches": []map[string]string{
 						{
 							"Metric": "desktop",
@@ -52,7 +55,7 @@ func TestEmailIntegrationTest(t *testing.T) {
 						},
 					},
 				},
-				To:       []string{"asdf@asdf.com "},
+				To:       []string{"asdf@asdf.com"},
 				Template: "alert_notification.html",
 			}