diff --git a/apps/passport-client/components/screens/LoginScreens/OneClickLoginScreen.tsx b/apps/passport-client/components/screens/LoginScreens/OneClickLoginScreen.tsx
index 0deb4655a7..220d61fe98 100644
--- a/apps/passport-client/components/screens/LoginScreens/OneClickLoginScreen.tsx
+++ b/apps/passport-client/components/screens/LoginScreens/OneClickLoginScreen.tsx
@@ -70,7 +70,9 @@ export function OneClickLoginScreen(): JSX.Element | null {
     if (!email || !code) {
       return;
     }
+
     try {
+      setLoading(true);
       await dispatch({
         type: "one-click-login",
         email,
@@ -78,6 +80,7 @@ export function OneClickLoginScreen(): JSX.Element | null {
         targetFolder
       });
     } catch (err) {
+      setLoading(false);
       await dispatch({
         type: "error",
         error: {
@@ -134,24 +137,29 @@ export function OneClickLoginScreen(): JSX.Element | null {
           <>
             <Spacer h={32} />
 
-            {ticketPreviews.map((ticket) => (
-              <CardOutlineExpanded>
-                <CardBodyContainer>
-                  <CardHeader isMainIdentity={true}>
-                    {ticket.eventName} ({ticket.ticketName})
-                  </CardHeader>
-                  <PODTicketCardBodyImpl
-                    idBasedVerifyURL=""
-                    ticketData={ticket}
-                    key={ticket.ticketId}
-                  />
-                </CardBodyContainer>
-              </CardOutlineExpanded>
-            ))}
-
-            <Spacer h={16} />
+            {ticketPreviews.length === 0 ? (
+              <div>No tickets found</div>
+            ) : (
+              <>
+                {ticketPreviews.map((ticket) => (
+                  <CardOutlineExpanded>
+                    <CardBodyContainer>
+                      <CardHeader isMainIdentity={true}>
+                        {ticket.eventName} ({ticket.ticketName})
+                      </CardHeader>
+                      <PODTicketCardBodyImpl
+                        idBasedVerifyURL=""
+                        ticketData={ticket}
+                        key={ticket.ticketId}
+                      />
+                    </CardBodyContainer>
+                  </CardOutlineExpanded>
+                ))}
+                <Spacer h={16} />
+              </>
+            )}
 
-            <Button onClick={handleOneClickLogin}>More Zupass</Button>
+            <Button onClick={handleOneClickLogin}>Continue to Zupass</Button>
           </>
         )}
       </AppContainer>
diff --git a/packages/lib/passport-interface/src/RequestTypes.ts b/packages/lib/passport-interface/src/RequestTypes.ts
index 99ceaf9a97..44f255ec5d 100644
--- a/packages/lib/passport-interface/src/RequestTypes.ts
+++ b/packages/lib/passport-interface/src/RequestTypes.ts
@@ -2,7 +2,6 @@ import { EdDSAPublicKey } from "@pcd/eddsa-pcd";
 import { EdDSATicketPCD, EdDSATicketPCDTypeName } from "@pcd/eddsa-ticket-pcd";
 import { PCDAction } from "@pcd/pcd-collection";
 import { ArgsOf, PCDOf, PCDPackage, SerializedPCD } from "@pcd/pcd-types";
-
 import { IPODTicketData } from "@pcd/pod-ticket-pcd/src/schema";
 import { SerializedSemaphoreGroup } from "@pcd/semaphore-group-pcd";
 import { SemaphoreSignaturePCD } from "@pcd/semaphore-signature-pcd";