diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index ce82cdd58ca..f56a64c8c0e 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -91,7 +91,7 @@ func CreateUser(cmd *m.CreateUserCommand) error {
 			Updated:   time.Now(),
 		}
 
-		if setting.SingleAccountMode {
+		if setting.SingleAccountMode && !user.IsAdmin {
 			accountUser.Role = m.RoleType(setting.DefaultAccountRole)
 		}