diff --git a/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/otp/OneTimePasswordForm.tsx b/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/otp/OneTimePasswordForm.tsx
index c9b05b960..24e4282eb 100644
--- a/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/otp/OneTimePasswordForm.tsx
+++ b/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/otp/OneTimePasswordForm.tsx
@@ -100,6 +100,7 @@ export default function OneTimePasswordForm({
   function handleOTPEntered(otp: string) {
     startTransition(async () => {
       const redirectRes = await onSubmit({ otp })
+      setOtp("")
       if (redirectRes.type === "replace") {
         router.replace(redirectRes.url)
         return
@@ -146,6 +147,7 @@ export default function OneTimePasswordForm({
       </div>
 
       <OTPInput
+        autoFocus
         value={otp}
         onChange={setOtp}
         maxLength={otpLength}