diff --git a/api/src/ProposalSystem.Api/Controllers/AuthController.cs b/api/src/ProposalSystem.Api/Controllers/AuthController.cs
index 8bbf8cb..247d122 100644
--- a/api/src/ProposalSystem.Api/Controllers/AuthController.cs
+++ b/api/src/ProposalSystem.Api/Controllers/AuthController.cs
@@ -107,7 +107,7 @@ public class AuthController : ControllerBase
             user = new User
             {
                 Id = Guid.NewGuid(),
-                CognitoSub = $"dev-{Guid.NewGuid():N}",
+                CognitoSub = $"dev-{request.Email}",
                 Email = request.Email,
                 DisplayName = request.DisplayName ?? request.Email.Split('@')[0],
                 Role = role,
@@ -118,6 +118,12 @@ public class AuthController : ControllerBase
             _db.Users.Add(user);
             await _db.SaveChangesAsync(ct);
         }
+        else if (user.Role != role)
+        {
+            user.Role = role;
+            user.UpdatedAt = DateTime.UtcNow;
+            await _db.SaveChangesAsync(ct);
+        }
 
         var claims = new List<Claim>
         {
diff --git a/api/src/ProposalSystem.Api/Services/CurrentUserService.cs b/api/src/ProposalSystem.Api/Services/CurrentUserService.cs
index 770b943..393b11e 100644
--- a/api/src/ProposalSystem.Api/Services/CurrentUserService.cs
+++ b/api/src/ProposalSystem.Api/Services/CurrentUserService.cs
@@ -80,7 +80,16 @@ public class CurrentUserService : ICurrentUserService
         };
 
         _db.Users.Add(_cachedUser);
-        await _db.SaveChangesAsync();
+        try
+        {
+            await _db.SaveChangesAsync();
+        }
+        catch (DbUpdateException)
+        {
+            _db.Entry(_cachedUser).State = EntityState.Detached;
+            _cachedUser = await _db.Users.FirstOrDefaultAsync(u => u.Email == email)
+                ?? throw new UnauthorizedAccessException("Could not resolve current user");
+        }
     }
 
     private User GetOrThrow()
diff --git a/web/src/pages/auth/LoginPage.tsx b/web/src/pages/auth/LoginPage.tsx
index 2ea1e04..017cddf 100644
--- a/web/src/pages/auth/LoginPage.tsx
+++ b/web/src/pages/auth/LoginPage.tsx
@@ -39,10 +39,17 @@ export default function LoginPage() {
     }
   }, [isAuthenticated, navigate]);
 
+  const devUsers: Record<string, { email: string; name: string }> = {
+    SysAdmin: { email: 'adam@seahavenind.com', name: 'Adam Moussa' },
+    Admin: { email: 'sarah@seahavenind.com', name: 'Sarah Chen' },
+    Dispatcher: { email: 'mike@seahavenind.com', name: 'Mike Torres' },
+  };
+
   const handleDevLogin = async (role: string) => {
     setLoading(true);
     try {
-      const user = await authApi.devLogin('adam@seahavenind.com', 'Adam Moussa', role);
+      const { email, name } = devUsers[role] ?? devUsers.SysAdmin;
+      const user = await authApi.devLogin(email, name, role);
       dispatch(setUser(user));
       navigate('/', { replace: true });
     } catch (err) {