diff --git a/lib/idx/remediate.ts b/lib/idx/remediate.ts
index 6cf698621..140420c91 100644
--- a/lib/idx/remediate.ts
+++ b/lib/idx/remediate.ts
@@ -150,8 +150,9 @@ export async function remediate(
     `);
   }
 
-  // Return next step to the caller
-  if (!remediator.canRemediate()) {
+  // always attempt remediation if `opts.step` is provided
+  if (!options.step && !remediator.canRemediate()) {
+    // Return next step to the caller
     const nextStep = getNextStep(authClient, remediator, idxResponse);
     return {
       idxResponse,
diff --git a/lib/idx/remediators/Base/SelectAuthenticator.ts b/lib/idx/remediators/Base/SelectAuthenticator.ts
index ffc0b06df..9be2f796e 100644
--- a/lib/idx/remediators/Base/SelectAuthenticator.ts
+++ b/lib/idx/remediators/Base/SelectAuthenticator.ts
@@ -89,11 +89,13 @@ export class SelectAuthenticator<T extends SelectAuthenticatorValues = SelectAut
 
     const { options } = remediationValue;
     const selectedOption = findMatchedOption(authenticators, options);
-    this.selectedAuthenticator = selectedOption.relatesTo; // track the selected authenticator
-    this.selectedOption = selectedOption;
-    return {
-      id: selectedOption?.value.form.value.find(({ name }) => name === 'id').value
-    };
+    if (selectedOption) {
+      this.selectedAuthenticator = selectedOption.relatesTo; // track the selected authenticator
+      this.selectedOption = selectedOption;
+      return {
+        id: selectedOption?.value.form.value.find(({ name }) => name === 'id').value
+      };
+    }
   }
 
   getInputAuthenticator(remediation) {
diff --git a/lib/idx/remediators/SelectAuthenticatorUnlockAccount.ts b/lib/idx/remediators/SelectAuthenticatorUnlockAccount.ts
index b500e574c..1d9761c60 100644
--- a/lib/idx/remediators/SelectAuthenticatorUnlockAccount.ts
+++ b/lib/idx/remediators/SelectAuthenticatorUnlockAccount.ts
@@ -38,11 +38,16 @@ export class SelectAuthenticatorUnlockAccount extends SelectAuthenticator<Select
     const authenticatorMap = super.mapAuthenticator(remediationValue);
     const methodTypeOption = this.selectedOption?.value.form.value.find(({ name }) => name === 'methodType');
 
+    const isSingleValue = () => {
+      if (Array.isArray(methodTypeOption?.options) && methodTypeOption?.options?.length === 1) {
+        return methodTypeOption?.options?.[0]?.value as string;
+      }
+    }
+
     // defaults to 'manually defined' value
     // 2nd: option may have pre-defined value, like stateHandle
     // 3rd: if only a single OV option is available, default to that option
-    const methodTypeValue = this.values.methodType ||
-      methodTypeOption?.value as string || methodTypeOption?.options?.[0]?.value as string;
+    const methodTypeValue = this.values.methodType || methodTypeOption?.value as string || isSingleValue();
 
     if (methodTypeValue) {
       return {
diff --git a/samples/generated/react-embedded-auth-with-sdk/src/App.jsx b/samples/generated/react-embedded-auth-with-sdk/src/App.jsx
index 46c9c9406..28fdd1e8b 100644
--- a/samples/generated/react-embedded-auth-with-sdk/src/App.jsx
+++ b/samples/generated/react-embedded-auth-with-sdk/src/App.jsx
@@ -56,6 +56,7 @@ function App() {
       history.replace('/terminal');
       setTransaction(null);
     } else if (status === IdxStatus.FAILURE) {
+      console.log('ERROR STATUS?')
       history.replace('/error');
       setTransaction(null);
     } else if (status === IdxStatus.CANCELED) {
diff --git a/samples/generated/react-embedded-auth-with-sdk/src/components/GeneralForm.jsx b/samples/generated/react-embedded-auth-with-sdk/src/components/GeneralForm.jsx
index eec0fd81c..f4d6d1814 100644
--- a/samples/generated/react-embedded-auth-with-sdk/src/components/GeneralForm.jsx
+++ b/samples/generated/react-embedded-auth-with-sdk/src/components/GeneralForm.jsx
@@ -46,6 +46,42 @@ const GeneralForm = () => {
     }
   };
 
+  const handleReselect = async e => {
+    e.preventDefault();
+    let newTransaction = transaction;
+
+    setProcessing(true);
+    try {
+      newTransaction = await oktaAuth.idx.proceed({ step: 'select-authenticator-authenticate' });
+      setTransaction(newTransaction);
+      setInputValues({});
+    }
+    catch (err) {
+      console.log('proceed threw');
+      console.log(err);
+    }
+    finally {
+      setProcessing(false);
+    }
+  };
+
+  const handleReselectPhone = async e => {
+    e.preventDefault();
+
+    setProcessing(true);
+    try {
+      const newTransaction = await oktaAuth.idx.proceed({ step: 'select-authenticator-authenticate', authenticator: 'phone_number' });
+      setTransaction(newTransaction);
+      setInputValues({});
+    }
+    catch (err) {
+      console.log(err);
+    }
+    finally {
+      setProcessing(false);
+    }
+  };
+
   const handleSkip = async () => {
     const newTransaction = await oktaAuth.idx.proceed({ skip: true });
     setTransaction(newTransaction);
@@ -120,6 +156,12 @@ const GeneralForm = () => {
           <Box paddingTop="s" paddingBottom="s">
             <Button wide type="submit" disabled={processing}>Submit</Button>
           </Box>
+          <Box paddingTop="s" paddingBottom="s">
+            <Button wide variant="secondary" disabled={processing} onClick={handleReselect}>Re-Select</Button>
+          </Box>
+          <Box paddingTop="s" paddingBottom="s">
+            <Button wide variant="secondary" disabled={processing} onClick={handleReselectPhone}>Re-Select Phone</Button>
+          </Box>
           {canRecoverPassword && (
             <Box paddingTop="s" paddingBottom="s">
               <Link href="#" name="forgotPassword" onClick={handleRecoverPassword}>Forgot password</Link>
diff --git a/samples/generated/react-embedded-auth-with-sdk/src/components/HomePage/HomePage.jsx b/samples/generated/react-embedded-auth-with-sdk/src/components/HomePage/HomePage.jsx
index 8fe259168..d5a24acb9 100644
--- a/samples/generated/react-embedded-auth-with-sdk/src/components/HomePage/HomePage.jsx
+++ b/samples/generated/react-embedded-auth-with-sdk/src/components/HomePage/HomePage.jsx
@@ -66,6 +66,7 @@ export default function Home() {
                 <Box display="flex" margin="s">
                   <Button name="signin" variant="primary" onClick={startIdxFlow('default')}>Sign In</Button>
                   <Button name="signup" variant="secondary" onClick={startIdxFlow('register')}>Sign Up</Button>
+                  <Button name="unlock" variant="secondary" onClick={startIdxFlow('unlockAccount')}>Unlock</Button>
                 </Box>
               </Box>
             )}
diff --git a/test/spec/idx/remediators/SelectAuthenticator.ts b/test/spec/idx/remediators/SelectAuthenticator.ts
index 765d104e6..905668899 100644
--- a/test/spec/idx/remediators/SelectAuthenticator.ts
+++ b/test/spec/idx/remediators/SelectAuthenticator.ts
@@ -1,4 +1,8 @@
-import { SelectAuthenticatorAuthenticate, SelectAuthenticatorEnroll } from '../../../../lib/idx/remediators';
+import {
+  SelectAuthenticatorAuthenticate,
+  SelectAuthenticatorEnroll,
+  SelectAuthenticatorUnlockAccount
+} from '../../../../lib/idx/remediators';
 import {
   SelectAuthenticatorEnrollRemediationFactory,
   SelectAuthenticatorAuthenticateRemediationFactory,
@@ -7,7 +11,10 @@ import {
   EmailAuthenticatorOptionFactory,
   IdxContextFactory,
   PhoneAuthenticatorFactory,
-  EmailAuthenticatorFactory
+  EmailAuthenticatorFactory,
+  SelectAuthenticatorUnlockAccountRemediationFactory,
+  SecurityQuestionAuthenticatorOptionFactory,
+  IdxValueFactory,
 } from '@okta/test.support/idx';
 
 describe('remediators/Base/SelectAuthenticator', () => {
@@ -122,3 +129,35 @@ describe('remediators/SelectAuthenticatorAuthenticate', () => {
     });
   });
 });
+
+describe('remediators/SelectAuthenticatorUnlockAccount', () => {
+  describe('mapAuthenticator', () => {
+    // TODO: return methodType 1
+
+    // TODO: return methodType 2
+
+    // TODO: return methodType 3
+
+    // TODO: return no methodType
+    fit('should not return a methodType value', () => {
+      const phoneAuthenticatorValue = AuthenticatorValueFactory.build({
+        options: [
+          PhoneAuthenticatorOptionFactory.build(),
+        ]
+      });
+      
+      const remediation = SelectAuthenticatorUnlockAccountRemediationFactory.build({
+        value: [
+          phoneAuthenticatorValue
+        ]
+      });
+
+      console.log(phoneAuthenticatorValue);
+      console.log('##########')
+      console.log(remediation);
+
+      const r = new SelectAuthenticatorUnlockAccount(remediation);
+      expect(r.mapAuthenticator(phoneAuthenticatorValue)).toBe(false);
+    });
+  });
+});