diff --git a/src/main.py b/src/main.py
index 203ad9b..0e90d5d 100644
--- a/src/main.py
+++ b/src/main.py
@@ -117,16 +117,20 @@ def cmd_codex_login(args):
         mail = get_mail_client(settings.mail_provider)
 
     try:
-        flow = CodexOAuthHTTPFlow(http, mail)
-        callback_url = flow.login(
+        mailbox = None
+        if args.mailbox_id:
+            mailbox = {"id": args.mailbox_id, "address": email, "password": args.mailbox_password, "token": ""}
+
+        flow = CodexOAuthHTTPFlow(
+            authorize_url=authorize_url,
             email=email,
             password=password,
             otp=args.otp,
             workspace_id=args.workspace_id,
-            authorize_url=authorize_url,
-            mailbox_id=args.mailbox_id,
-            mailbox_password=args.mailbox_password,
+            mailbox=mailbox,
+            mail_client=mail,
         )
+        callback_url = flow.run()
         print(f"\nCallback URL:\n{callback_url}")
         return 0
     except Exception as e: