diff --git a/docs/ocis/getting-started/demo-users.md b/docs/ocis/getting-started/demo-users.md
index 470a1ed39df..89edea3c995 100644
--- a/docs/ocis/getting-started/demo-users.md
+++ b/docs/ocis/getting-started/demo-users.md
@@ -21,7 +21,7 @@ Following users are available in the demo set:
 | admin     | admin or the one generated by `ocis init` | admin@example.org     | admin       | users                                                                   |
 | einstein  | relativity                                | einstein@example.org  | user        | users, philosophy-haters, physics-lovers, sailing-lovers, violin-haters |
 | marie     | radioactivity                             | marie@example.org     | user        | users, physics-lovers, polonium-lovers, radium-lovers                   |
-| moss      | vista                                     | moss@example.org      | admin       | users                                                                   |
+| moss      | vista                                     | moss@example.org      | space admin | users                                                                   |
 | richard   | superfluidity                             | richard@example.org   | user        | users, philosophy-haters, physics-lovers, quantum-lovers                |
 | katherine | gemini                                    | katherine@example.org | space admin | users, sailing-lovers, physics-lovers, quantum-lovers                   |
 
diff --git a/services/settings/pkg/service/v0/settings.go b/services/settings/pkg/service/v0/settings.go
index 8f810c952b9..13784ba68bf 100644
--- a/services/settings/pkg/service/v0/settings.go
+++ b/services/settings/pkg/service/v0/settings.go
@@ -536,9 +536,6 @@ func (g Service) defaultRoleAssignments() []*settingsmsg.UserRoleAssignment {
 	return []*settingsmsg.UserRoleAssignment{
 		// default admin users
 		{
-			AccountUuid: "058bff95-6708-4fe5-91e4-9ea3d377588b", // demo user "moss"
-			RoleId:      BundleUUIDRoleAdmin,
-		}, {
 			AccountUuid: g.config.AdminUserID,
 			RoleId:      BundleUUIDRoleAdmin,
 		},
@@ -552,6 +549,9 @@ func (g Service) defaultRoleAssignments() []*settingsmsg.UserRoleAssignment {
 		},
 		// default users with role "spaceadmin"
 		{
+			AccountUuid: "058bff95-6708-4fe5-91e4-9ea3d377588b", // demo user "moss"
+			RoleId:      BundleUUIDRoleSpaceAdmin,
+		}, {
 			AccountUuid: "534bb038-6f9d-4093-946f-133be61fa4e7", // demo user "katherine"
 			RoleId:      BundleUUIDRoleSpaceAdmin,
 		},
diff --git a/services/settings/pkg/store/defaults/defaults.go b/services/settings/pkg/store/defaults/defaults.go
index 91173c657db..37c1b07a207 100644
--- a/services/settings/pkg/store/defaults/defaults.go
+++ b/services/settings/pkg/store/defaults/defaults.go
@@ -501,9 +501,6 @@ func DefaultRoleAssignments(cfg *config.Config) []*settingsmsg.UserRoleAssignmen
 	return []*settingsmsg.UserRoleAssignment{
 		// default admin users
 		{
-			AccountUuid: "058bff95-6708-4fe5-91e4-9ea3d377588b", // demo user "moss"
-			RoleId:      BundleUUIDRoleAdmin,
-		}, {
 			AccountUuid: cfg.AdminUserID,
 			RoleId:      BundleUUIDRoleAdmin,
 		},
@@ -520,6 +517,9 @@ func DefaultRoleAssignments(cfg *config.Config) []*settingsmsg.UserRoleAssignmen
 		},
 		// default users with role "spaceadmin"
 		{
+			AccountUuid: "058bff95-6708-4fe5-91e4-9ea3d377588b", // demo user "moss"
+			RoleId:      BundleUUIDRoleAdmin,
+		}, {
 			AccountUuid: "534bb038-6f9d-4093-946f-133be61fa4e7",
 			RoleId:      BundleUUIDRoleSpaceAdmin,
 		},