diff --git a/accounts/pkg/config/defaults/defaultconfig.go b/accounts/pkg/config/defaults/defaultconfig.go
index 9b404b65dae..8e8a82266f3 100644
--- a/accounts/pkg/config/defaults/defaultconfig.go
+++ b/accounts/pkg/config/defaults/defaultconfig.go
@@ -71,7 +71,7 @@ func DefaultConfig() *config.Config {
 		},
 		ServiceUser: config.ServiceUser{
 			UUID:     "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-			Username: "service user",
+			Username: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
 			UID:      0,
 			GID:      0,
 		},
diff --git a/settings/pkg/store/metadata/assignments.go b/settings/pkg/store/metadata/assignments.go
index 7095ab69262..9f71ce0440c 100644
--- a/settings/pkg/store/metadata/assignments.go
+++ b/settings/pkg/store/metadata/assignments.go
@@ -13,7 +13,7 @@ import (
 
 // ListRoleAssignments loads and returns all role assignments matching the given assignment identifier.
 func (s *Store) ListRoleAssignments(accountUUID string) ([]*settingsmsg.UserRoleAssignment, error) {
-	if s.mdc == nil {
+	if s.mdc == nil || accountUUID == "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad" {
 		return defaultRoleAssignments(accountUUID), nil
 	}
 	s.Init()