diff --git a/packages/client/src/components/AuthComponent.tsx b/packages/client/src/components/AuthComponent.tsx
index f29970c..d14e4bb 100644
--- a/packages/client/src/components/AuthComponent.tsx
+++ b/packages/client/src/components/AuthComponent.tsx
@@ -1,5 +1,5 @@
-import { Button, FormField, Input, SpaceBetween } from "@cloudscape-design/components";
-import { useState } from "react";
+import { Button, FormField, Icon, Input, SpaceBetween } from "@cloudscape-design/components";
+import { useEffect, useState } from "react";
 
 // COPIED FROM SERVER
 export enum IAuthMode {
@@ -13,31 +13,38 @@ export interface IAuthComponentProps {
   authMode: IAuthMode,
   secret: string | null;
   onUnlock: () => void;
-  onError: (res: any) => void;
+  onError?: (res: any) => void;
+  runCheck?: number;
 }
 
-export const AuthComponent = ({ door, secret, authMode, onError, onUnlock }: IAuthComponentProps) => {
+export const AuthComponent = ({ door, secret, authMode, onError, onUnlock, runCheck }: IAuthComponentProps) => {
   const [ key, setKey ] = useState(secret);
+  const [ error, setError ] = useState("");
+
+  useEffect(() => {
+    if (runCheck) {
+      onSubmit();
+    }
+  }, [runCheck])
+
+  const onSubmit = () => {
+    fetch(`/api/door/${door}/auth?key=${key}&rotatingKey=${key}`)
+    .then(async res => {
+      if (res.status !== 200) {
+        setError("Incorrect PIN");
+        onError && onError(await res.json());
+        return;
+      }
+      onUnlock();
+    })
+  }
+
   return (
     <>
       <SpaceBetween size='l'>
-        <FormField label={"PIN"} constraintText={"Enter the PIN to unlock the door"}>
+        <FormField errorText={error} label={"PIN"} constraintText={"Enter the PIN to unlock the door"}>
           <Input readOnly={secret !== null} value={key || ""} onChange={({ detail }) => setKey(detail.value)} />
         </FormField>
-        <Button 
-          onClick={() => 
-            fetch(`/api/door/${door}/auth?key=${key}&rotatingKey=${key}`)
-              .then(async res => {
-                if (res.status !== 200) {
-                  onError(await res.json());
-                  return;
-                }
-                onUnlock();
-              })
-          }
-        >
-          Unlock the door
-        </Button>
       </SpaceBetween>
     </>
   );
diff --git a/packages/client/src/pages/DoorPage.tsx b/packages/client/src/pages/DoorPage.tsx
index f990619..fa8419d 100644
--- a/packages/client/src/pages/DoorPage.tsx
+++ b/packages/client/src/pages/DoorPage.tsx
@@ -35,12 +35,16 @@ export function DoorPage() {
   const secret = searchParams.get('key') || searchParams.get('rotatingKey');
   const [ alerts, setAlerts ] = useState<FlashbarProps.MessageDefinition[]>([]);
   const [ polling, setPolling ] = useState(false);
-  const [ inProgressAlert, setInProgressAlert ] = useState("");
+  const [ submitPin, setSubmitPin ] = useState(0);
 
   const dismissAlert = (id: string) => {
     setAlerts(alerts => alerts.filter(alert => alert.id !== id));
   }
 
+  const dismissInProgressAlerts = () => {
+    setAlerts(alerts => alerts.filter(alert => alert.type !== 'in-progress'));
+  }
+
   const createAlert = (type: FlashbarProps.Type, content: ReactNode): FlashbarProps.MessageDefinition => {
     const id = `${Math.random()}`;
     return {
@@ -54,7 +58,7 @@ export function DoorPage() {
 
   const addAlert = (type: FlashbarProps.Type, content: ReactNode): string => {
     const newAlert = createAlert(type, content);
-    setAlerts([
+    setAlerts(alerts => [
       newAlert,
       ...alerts,
     ]);
@@ -77,13 +81,16 @@ export function DoorPage() {
         setStep(3);
         setPolling(false);
         setAlerts(alerts => 
-          [createAlert("success", "Buzzer successfully unlocked"), ...alerts.filter(alert => alert.id !== inProgressAlert)]
+          [createAlert("success", "Buzzer successfully unlocked"), ...alerts.filter(alert => alert.type !== 'in-progress')]
         );
       }
 
     }, 1000);
 
-    return () => clearInterval(timer);
+    return () => {
+      clearInterval(timer);
+      dismissInProgressAlerts();
+    }
   }, [polling]);
 
   return (
@@ -131,8 +138,15 @@ export function DoorPage() {
           }}
           activeStepIndex={step}
           onNavigate={({ detail }) => {
+            if (detail.requestedStepIndex < step) {
+              dismissInProgressAlerts();
+              setSubmitPin(0);
+              setPolling(false);
+              setStep(detail.requestedStepIndex);
+              return;
+            }
             if (detail.requestedStepIndex === 2) {
-              addAlert("error", "You must unlock the door to proceed");
+              setSubmitPin(submitPin + 1);
               return;
             }
 
@@ -144,6 +158,8 @@ export function DoorPage() {
           }}
           onCancel={() => {
             setStep(0);
+            dismissInProgressAlerts();
+            setSubmitPin(0);
           }}
           steps={[
             {
@@ -174,14 +190,13 @@ export function DoorPage() {
                 >
                   <AuthComponent 
                     authMode={IAuthMode.FIXED_PIN}
+                    runCheck={submitPin}
                     door={door} 
                     secret={secret} 
-                    onError={(res) => {
-                      addAlert("error", "Authentication failed, double check the credentials");
-                    }} 
                     onUnlock={() => {
                       setStep(2);
-                      const inprogAlert = addAlert("in-progress", (
+                      dismissInProgressAlerts();
+                      addAlert("in-progress", (
                         <CountdownBar 
                           timeSeconds={doorResponse.timeout} 
                           onExpiry={() => {
@@ -192,7 +207,6 @@ export function DoorPage() {
                         />
                       ));
 
-                      setInProgressAlert(inprogAlert);
                       setPolling(true);
                     }} 
                   />