diff --git a/lib/towerops_web/user_auth.ex b/lib/towerops_web/user_auth.ex
index 81ee6a22..1e6fdbec 100644
--- a/lib/towerops_web/user_auth.ex
+++ b/lib/towerops_web/user_auth.ex
@@ -74,17 +74,27 @@ defmodule ToweropsWeb.UserAuth do
       superuser_id = get_session(conn, :superuser_id)
       target_user_id = get_session(conn, :target_user_id)
 
-      with superuser when not is_nil(superuser) <- Accounts.get_user(superuser_id),
-           target_user when not is_nil(target_user) <- Accounts.get_user(target_user_id) do
-        assign(conn, :current_scope, Scope.for_impersonation(superuser, target_user))
+      # Validate we have both IDs before attempting to fetch users
+      if superuser_id && target_user_id do
+        with superuser when not is_nil(superuser) <- Accounts.get_user(superuser_id),
+             target_user when not is_nil(target_user) <- Accounts.get_user(target_user_id) do
+          assign(conn, :current_scope, Scope.for_impersonation(superuser, target_user))
+        else
+          _ ->
+            # Impersonation invalid, clear it
+            conn
+            |> delete_session(:superuser_id)
+            |> delete_session(:target_user_id)
+            |> delete_session(:impersonating)
+            |> assign(:current_scope, Scope.for_user(nil))
+        end
       else
-        _ ->
-          # Impersonation invalid, clear it
-          conn
-          |> delete_session(:superuser_id)
-          |> delete_session(:target_user_id)
-          |> delete_session(:impersonating)
-          |> assign(:current_scope, Scope.for_user(nil))
+        # Missing IDs, clear invalid impersonation state
+        conn
+        |> delete_session(:superuser_id)
+        |> delete_session(:target_user_id)
+        |> delete_session(:impersonating)
+        |> assign(:current_scope, Scope.for_user(nil))
       end
     else
       # Normal authentication flow
@@ -411,11 +421,17 @@ defmodule ToweropsWeb.UserAuth do
         superuser_id = session["superuser_id"]
         target_user_id = session["target_user_id"]
 
-        with superuser when not is_nil(superuser) <- Accounts.get_user(superuser_id),
-             target_user when not is_nil(target_user) <- Accounts.get_user(target_user_id) do
-          Scope.for_impersonation(superuser, target_user)
+        # Validate we have both IDs before attempting to fetch users
+        if superuser_id && target_user_id do
+          with superuser when not is_nil(superuser) <- Accounts.get_user(superuser_id),
+               target_user when not is_nil(target_user) <- Accounts.get_user(target_user_id) do
+            Scope.for_impersonation(superuser, target_user)
+          else
+            _ -> Scope.for_user(nil)
+          end
         else
-          _ -> Scope.for_user(nil)
+          # Missing IDs, return nil user
+          Scope.for_user(nil)
         end
       else
         # Normal authentication flow