diff --git a/conf/defaults.ini b/conf/defaults.ini
index 826f69ed9bb..5318e89b2ad 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -78,7 +78,7 @@ auto_assign_org_role = Viewer
 ; enable anonymous access
 enabled = false
 ; specify organization name that should be used for unauthenticated users
-org_name = main
+org_name = Main Org.
 ; specify role for unauthenticated users
 org_role = Viewer
 
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 158a986e744..81d4067bf5e 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -42,7 +42,7 @@ func getOrgIdForNewUser(userEmail string, sess *session) (int64, error) {
 		if has {
 			return org.Id, nil
 		} else {
-			org.Name = "Main org."
+			org.Name = "Main Org."
 			org.Id = 1
 		}
 	} else {