diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts
index 21bcd5fc4..99b70a1a4 100644
--- a/apps/red-ui/src/app/services/user.service.ts
+++ b/apps/red-ui/src/app/services/user.service.ts
@@ -113,8 +113,8 @@ export class UserService extends EntitiesService<User, IUser> {
 
     find(id: string): User | undefined {
         if (id?.toLowerCase() === 'system') {
-            return new User({ email: 'System' }, [], 'system');
+            return new User({ username: 'System' }, [], 'system');
         }
-        return super.find(id);
+        return super.find(id) || new User({ username: 'Deleted User' }, [], 'deleted');
     }
 }