diff --git a/Source/Immutable/Private/Immutable/Mac/ImmutableMac.cpp b/Source/Immutable/Private/Immutable/Mac/ImmutableMac.cpp
index 8707f504..db1a824c 100644
--- a/Source/Immutable/Private/Immutable/Mac/ImmutableMac.cpp
+++ b/Source/Immutable/Private/Immutable/Mac/ImmutableMac.cpp
@@ -1,7 +1,9 @@
 #include "ImmutableMac.h"
+
+#include "Engine/GameEngine.h"
+
 #include "Immutable/ImmutablePassport.h"
 #include "Immutable/ImmutableSubsystem.h"
-#include "Engine/GameEngine.h"
 
 #if WITH_EDITOR
 #include "Editor.h"
@@ -26,17 +28,24 @@ ASWebAuthenticationSession *_authSession;
 }
 
 + (UImmutablePassport*) getPassport {
-    UWorld* World = nullptr;
-
 #if WITH_EDITOR
 	if (GEditor)
 	{
 		for (const auto& Context : GEditor->GetWorldContexts())
 		{
-			if (Context.WorldType == EWorldType::PIE && Context.World())
+			if (auto* World = Context.World())
 			{
-				World = Context.World();
-				break;
+				if (auto GameInstance = World->GetGameInstance())
+				{
+					if (auto ImmutableSubsystem = GameInstance->GetSubsystem<UImmutableSubsystem>())
+					{
+						auto WeakPassport = ImmutableSubsystem->GetPassport();
+						if (auto Passport = WeakPassport.Get())
+						{
+							return Passport;
+						}
+					}
+				}
 			}
 		}
 	}
@@ -47,26 +56,17 @@ ASWebAuthenticationSession *_authSession;
 	}
 #endif
 
-	if (!World) {
-		return nil;
-	}
-
-	auto ImmutableSubsystem = World->GetGameInstance()->GetSubsystem<UImmutableSubsystem>();
-
-	if (!ImmutableSubsystem) {
-		return nil;
-	}
-
-	auto Passport = ImmutableSubsystem->GetPassport();
-
-	if (!Passport.IsValid()) {
-		return nil;
-	}
-
-	return Passport.Get();
+	return nil;
 }
 
 - (void)launchUrl:(const char *)url forRedirectUri:(const char *)redirectUri {
+  // For automation, use the browser-based method
+  if (GIsAutomationTesting) {
+    NSLog(@"Using automation mode for authentication (GIsAutomationTesting is true)");
+    [self launchUrlInBrowser:url];
+    return;
+  }
+
   if (@available(macOS 10.15, *)) {
     NSURL *URL =
         [NSURL URLWithString:[[NSString alloc] initWithUTF8String:url]];
@@ -104,6 +104,20 @@ ASWebAuthenticationSession *_authSession;
   }
 }
 
+- (void)launchUrlInBrowser:(const char *)url {
+    // Add redundant check to ensure this only runs for automated testing
+    if (!GIsAutomationTesting) {
+        return;
+    }
+
+    // Create URL object
+    NSURL *URL = [NSURL URLWithString:[[NSString alloc] initWithUTF8String:url]];
+    
+    // Open URL in default browser
+    [[NSWorkspace sharedWorkspace] openURL:URL];
+    NSLog(@"Opened URL in browser for automation: %@", URL);
+}
+
 - (ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:
     (ASWebAuthenticationSession *)session API_AVAILABLE(macos(10.15)) {
   return [[[NSApplication sharedApplication] windows] firstObject];
diff --git a/Source/Immutable/Private/Immutable/Mac/ImmutableMac.h b/Source/Immutable/Private/Immutable/Mac/ImmutableMac.h
index 46ba4451..80ca292c 100644
--- a/Source/Immutable/Private/Immutable/Mac/ImmutableMac.h
+++ b/Source/Immutable/Private/Immutable/Mac/ImmutableMac.h
@@ -7,4 +7,5 @@
     : NSObject <ASWebAuthenticationPresentationContextProviding>
 + (ImmutableMac *)instance;
 - (void)launchUrl:(const char *)url forRedirectUri:(const char *)redirectUri;
+- (void)launchUrlInBrowser:(const char *)url;
 @end