diff --git a/conf/defaults.ini b/conf/defaults.ini
index 4636d71e2d5..386ffe58c4e 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -247,6 +247,9 @@ admin_user = admin
 # default admin password, can be changed before first start of grafana, or in profile settings
 admin_password = admin
 
+# default admin email, created on startup
+admin_email = admin@localhost
+
 # used for signing
 secret_key = SW2YcwTIb9zpOOhoPsMm
 
diff --git a/conf/sample.ini b/conf/sample.ini
index 66ea96a8237..78387ec2d09 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -247,6 +247,9 @@
 # default admin password, can be changed before first start of grafana,  or in profile settings
 ;admin_password = admin
 
+# default admin email, created on startup
+;admin_email = admin@localhost
+
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm
 
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index b87a447a779..0e46295cb26 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -208,7 +208,7 @@ func (ss *SQLStore) ensureMainOrgAndAdminUser() error {
 			ss.log.Debug("Creating default admin user")
 			if _, err := ss.createUser(ctx, sess, user.CreateUserCommand{
 				Login:    ss.Cfg.AdminUser,
-				Email:    ss.Cfg.AdminUser + "@localhost",
+				Email:    ss.Cfg.AdminEmail,
 				Password: ss.Cfg.AdminPassword,
 				IsAdmin:  true,
 			}); err != nil {
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 74ef1fe9d44..10e8fba80d4 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -293,6 +293,7 @@ type Cfg struct {
 	BasicAuthEnabled             bool
 	AdminUser                    string
 	AdminPassword                string
+	AdminEmail                   string
 
 	// AWS Plugin Auth
 	AWSAllowedAuthProviders []string
@@ -1254,6 +1255,7 @@ func readSecuritySettings(iniFile *ini.File, cfg *Cfg) error {
 	cfg.DisableInitAdminCreation = security.Key("disable_initial_admin_creation").MustBool(false)
 	cfg.AdminUser = valueAsString(security, "admin_user", "")
 	cfg.AdminPassword = valueAsString(security, "admin_password", "")
+	cfg.AdminEmail = valueAsString(security, "admin_email", fmt.Sprintf("%s@localhost", cfg.AdminUser))
 
 	return nil
 }