diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go
index 0d785b9cc7d..c8ac0fda541 100644
--- a/pkg/services/user/userimpl/store_test.go
+++ b/pkg/services/user/userimpl/store_test.go
@@ -965,7 +965,7 @@ func TestMetricsUsage(t *testing.T) {
 
 	_, usrSvc := createOrgAndUserSvc(t, ss, ss.Cfg)
 
-	t.Run("", func(t *testing.T) {
+	t.Run("Get empty role metrics for an org", func(t *testing.T) {
 		orgId := int64(1)
 
 		// create first user
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 7779aa58705..baff43466d9 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -1680,6 +1680,7 @@ func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
 	cfg.AutoAssignOrgId = users.Key("auto_assign_org_id").MustInt(1)
 	cfg.AutoAssignOrgRole = users.Key("auto_assign_org_role").In(
 		string(roletype.RoleViewer), []string{
+			string(roletype.RoleNone),
 			string(roletype.RoleViewer),
 			string(roletype.RoleEditor),
 			string(roletype.RoleAdmin)})