diff --git a/src/components/Auth/Login.tsx b/src/components/Auth/Login.tsx
index dfe4aaac4de..87eb7c10004 100644
--- a/src/components/Auth/Login.tsx
+++ b/src/components/Auth/Login.tsx
@@ -633,6 +633,7 @@ const Login = (props: LoginProps) => {
                             }}
                             maxLength={5}
                             placeholder="Enter 5-digit OTP"
+                            autoFocus
                           />
                           {otpValidationError && (
                             <p className="text-sm text-red-500">
diff --git a/src/components/Patient/PatientRegistration.tsx b/src/components/Patient/PatientRegistration.tsx
index 1c1113081ef..6f46b141468 100644
--- a/src/components/Patient/PatientRegistration.tsx
+++ b/src/components/Patient/PatientRegistration.tsx
@@ -726,7 +726,7 @@ export default function PatientRegistration(
               <Button
                 variant={"secondary"}
                 type="button"
-                onClick={() => goBack()}
+                onClick={() => goBack(`/facility/${facilityId}/patients`)}
               >
                 {t("cancel")}
               </Button>
diff --git a/src/pages/Appointments/BookAppointment.tsx b/src/pages/Appointments/BookAppointment.tsx
index fb61ed487f4..8b0c0bcc6de 100644
--- a/src/pages/Appointments/BookAppointment.tsx
+++ b/src/pages/Appointments/BookAppointment.tsx
@@ -175,7 +175,15 @@ export default function BookAppointment(props: Props) {
           </div>
 
           <div className="flex justify-end gap-4">
-            <Button variant="outline" type="button" onClick={() => goBack()}>
+            <Button
+              variant="outline"
+              type="button"
+              onClick={() =>
+                goBack(
+                  `/facility/${props.facilityId}/patient/${props.patientId}/appointments`,
+                )
+              }
+            >
               {t("cancel")}
             </Button>
             <Button
diff --git a/src/pages/Patients/VerifyPatient.tsx b/src/pages/Patients/VerifyPatient.tsx
index 01f1feb744b..aa2fa1dd61c 100644
--- a/src/pages/Patients/VerifyPatient.tsx
+++ b/src/pages/Patients/VerifyPatient.tsx
@@ -239,7 +239,7 @@ export default function VerifyPatient(props: { facilityId: string }) {
               <Button
                 variant={"primary_gradient"}
                 className="gap-3 group"
-                onClick={() => goBack()}
+                onClick={() => goBack(`/facility/${props.facilityId}/patients`)}
               >
                 {t("go_back")}
               </Button>
diff --git a/src/pages/PublicAppointments/Schedule.tsx b/src/pages/PublicAppointments/Schedule.tsx
index fa93b45f1d8..aa87de8a5de 100644
--- a/src/pages/PublicAppointments/Schedule.tsx
+++ b/src/pages/PublicAppointments/Schedule.tsx
@@ -216,7 +216,7 @@ export function ScheduleAppointment(props: AppointmentsProps) {
           <Button
             variant="outline"
             className="border border-secondary-400"
-            onClick={() => goBack()}
+            onClick={() => goBack(`/facility/${facilityId}`)}
           >
             <span className="text-sm underline">{t("back")}</span>
           </Button>
diff --git a/src/pages/PublicAppointments/auth/PatientLogin.tsx b/src/pages/PublicAppointments/auth/PatientLogin.tsx
index 6667f453387..51fed164ecb 100644
--- a/src/pages/PublicAppointments/auth/PatientLogin.tsx
+++ b/src/pages/PublicAppointments/auth/PatientLogin.tsx
@@ -175,7 +175,12 @@ export default function PatientLogin({
                     {t("enter_the_verification_code")}
                   </FormLabel>
                   <FormControl>
-                    <InputOTP maxLength={5} {...field} className="focus:ring-0">
+                    <InputOTP
+                      maxLength={5}
+                      {...field}
+                      className="focus:ring-0"
+                      autoFocus
+                    >
                       <InputOTPGroup>
                         <InputOTPSlot index={0} />
                       </InputOTPGroup>
@@ -229,7 +234,7 @@ export default function PatientLogin({
         className="border border-secondary-400"
         onClick={() =>
           page === "send"
-            ? goBack()
+            ? goBack(`/facility/${facilityId}`)
             : navigate(
                 `/facility/${facilityId}/appointments/${staffId}/otp/send`,
               )