diff --git a/object/application.go b/object/application.go
index 93400dc5..61b98263 100644
--- a/object/application.go
+++ b/object/application.go
@@ -346,7 +346,7 @@ func GetMaskedApplications(applications []*Application, userId string) []*Applic
 }
 
 func GetAllowedApplications(applications []*Application, userId string) ([]*Application, error) {
-	if isUserIdGlobalAdmin(userId) {
+	if userId == "" || isUserIdGlobalAdmin(userId) {
 		return applications, nil
 	}
 
@@ -354,8 +354,7 @@ func GetAllowedApplications(applications []*Application, userId string) ([]*Appl
 	if err != nil {
 		return nil, err
 	}
-
-	if user.IsAdmin {
+	if user != nil && user.IsAdmin {
 		return applications, nil
 	}
 
diff --git a/object/user.go b/object/user.go
index c6873b8d..896efd43 100644
--- a/object/user.go
+++ b/object/user.go
@@ -851,7 +851,7 @@ func (user *User) GetId() string {
 }
 
 func isUserIdGlobalAdmin(userId string) bool {
-	return strings.HasPrefix(userId, "built-in/")
+	return strings.HasPrefix(userId, "built-in/") || strings.HasPrefix(userId, "app/")
 }
 
 func ExtendUserWithRolesAndPermissions(user *User) (err error) {