diff --git a/fathom-rest-security/src/main/java/fathom/rest/controller/extractors/AuthExtractor.java b/fathom-rest-security/src/main/java/fathom/rest/controller/extractors/AuthExtractor.java
index <HASH>..<HASH> 100644
--- a/fathom-rest-security/src/main/java/fathom/rest/controller/extractors/AuthExtractor.java
+++ b/fathom-rest-security/src/main/java/fathom/rest/controller/extractors/AuthExtractor.java
@@ -58,7 +58,8 @@ public class AuthExtractor implements TypedExtractor, NamedExtractor, Configurab
     @Override
     public Account extract(Context context) {
         Account session = context.getSession(AuthConstants.ACCOUNT_ATTRIBUTE);
-        Account account = Optional.fromNullable(session).or(Account.GUEST);
+        Account local = context.getLocal(AuthConstants.ACCOUNT_ATTRIBUTE);
+        Account account = Optional.fromNullable(session).or(Optional.fromNullable(local).or(Account.GUEST));
         return account;
     }
 }
Try to extract Account from local if there is no Account in the session