diff --git a/AUTHORS.md b/AUTHORS.md
index f35252cce02..a18d2890c15 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -101,3 +101,4 @@ If you have contributed to Kolibri, feel free to add your name and Github accoun
 | Garvit Singhal | GarvitSinghal47 |
 | Adars T S | a6ar55 |
 | Shivang Rawat | ShivangRawat30 |
+| Alex Vélez | AlexVelezLl |
diff --git a/kolibri/core/assets/src/views/userAccounts/PasswordTextbox.vue b/kolibri/core/assets/src/views/userAccounts/PasswordTextbox.vue
index d27334f8a3b..d598eb6fada 100644
--- a/kolibri/core/assets/src/views/userAccounts/PasswordTextbox.vue
+++ b/kolibri/core/assets/src/views/userAccounts/PasswordTextbox.vue
@@ -49,6 +49,10 @@
       shouldValidate: {
         type: Boolean,
       },
+      shouldValidateOnEnter: {
+        type: Boolean,
+        default: true,
+      },
       // Set to false if you just want one password field
       showConfirmationInput: {
         type: Boolean,
@@ -122,6 +126,9 @@
         this.$refs.password.focus();
       },
       checkErrorsAndSubmit(e) {
+        if (!this.shouldValidateOnEnter) {
+          return;
+        }
         if (this.valid) {
           this.$emit('submitNewPassword');
         } else {
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue b/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue
index 48bcac5cc6b..a4c0c5aac6e 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue
@@ -10,12 +10,14 @@
       :label="$tr('joinFacilityLabel')"
       :value="Options.JOIN"
       class="radio-button"
+      :autofocus="isJoinSetup"
     />
     <KRadioButton
       v-model="selected"
       :label="$tr('importFromFacilityLabel')"
       :value="Options.IMPORT"
       class="radio-button"
+      :autofocus="isImportSetup"
     />
     <SelectDeviceModalGroup
       v-if="showSelectAddressModal"
@@ -47,6 +49,14 @@
         showSelectAddressModal: false,
       };
     },
+    computed: {
+      isJoinSetup() {
+        return this.selected === Options.JOIN;
+      },
+      isImportSetup() {
+        return this.selected === Options.IMPORT;
+      },
+    },
     methods: {
       handleContinueImport(address) {
         this.wizardService.send({
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/CreateLearnerAccountForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/CreateLearnerAccountForm.vue
index 1d0dbf7cdb6..92a32e6753d 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/CreateLearnerAccountForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/CreateLearnerAccountForm.vue
@@ -15,6 +15,7 @@
       class="radio-button"
       :label="$tr('yesOptionLabel')"
       :value="true"
+      :autofocus="setting"
     />
     <KRadioButton
       ref="noRadio"
@@ -22,6 +23,7 @@
       class="radio-button"
       :label="$tr('noOptionLabel')"
       :value="false"
+      :autofocus="!setting"
     />
     <p class="description">
       {{ getCommonSyncString('changeLater') }}
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue
index e99f13dd900..652e0adfa1b 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue
@@ -9,12 +9,14 @@
       :label="$tr('fullDeviceLabel')"
       :value="Options.FULL"
       :description="$tr('fullDeviceDescription')"
+      :autofocus="isFullSetup"
     />
     <KRadioButton
       v-model="selected"
       :label="$tr('learnOnlyDeviceLabel')"
       :value="Options.LOD"
       :description="$tr('learnOnlyDeviceDescription')"
+      :autofocus="isLODSetup"
     />
   </OnboardingStepBase>
 
@@ -43,6 +45,14 @@
         selected,
       };
     },
+    computed: {
+      isFullSetup() {
+        return this.selected === Options.FULL;
+      },
+      isLODSetup() {
+        return this.selected === Options.LOD;
+      },
+    },
     methods: {
       handleContinue() {
         this.wizardService.send({ type: 'CONTINUE', value: this.selected });
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue
index 8f8e1cb66e7..4cbd0fe69ac 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue
@@ -15,12 +15,14 @@
       v-model="setting"
       :label="$tr('yesOptionLabel')"
       :value="true"
+      :autofocus="setting"
     />
     <KRadioButton
       ref="noRadio"
       v-model="setting"
       :label="$tr('noOptionLabel')"
       :value="false"
+      :autofocus="!setting"
     />
     <p class="form">
       {{ $tr('changeLater') }}
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue
index d15e46e8452..315bc0fe2a1 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue
@@ -12,12 +12,14 @@
       :value="UsePresets.ON_MY_OWN"
       :label="$tr('onMyOwnLabel')"
       :description="getCommonSyncString('onMyOwn')"
+      :autofocus="isOnMyOwnSetup"
     />
     <KRadioButton
       v-model="selected"
       :value="UsePresets.GROUP"
       :label="$tr('groupLearningLabel')"
       :description="$tr('groupLearningDescription')"
+      :autofocus="isGroupSetup"
     />
   </OnboardingStepBase>
 
@@ -46,6 +48,9 @@
       isOnMyOwnSetup() {
         return this.selected === UsePresets.ON_MY_OWN;
       },
+      isGroupSetup() {
+        return this.selected === UsePresets.GROUP;
+      },
       UsePresets() {
         return UsePresets;
       },
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue
index d10aa09d748..8c2a5c31ba7 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue
@@ -14,6 +14,7 @@
       class="radio-button"
       :label="$tr('yesOptionLabel')"
       :value="true"
+      :autofocus="setting"
     />
     <KRadioButton
       ref="noRadio"
@@ -21,6 +22,7 @@
       class="radio-button"
       :label="$tr('noOptionLabel')"
       :value="false"
+      :autofocus="!setting"
     />
     <p class="description">
       {{ getCommonSyncString('changeLater') }}
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue
index f4a4095ead1..9552aff93d0 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue
@@ -10,12 +10,14 @@
       :label="$tr('createFacilityLabel')"
       :value="Options.NEW"
       class="radio-button"
+      :autofocus="isNewFacilitySetup"
     />
     <KRadioButton
       v-model="selected"
       :label="$tr('importFacilityLabel')"
       :value="Options.IMPORT"
       class="radio-button"
+      :autofocus="isImportFacilitySetup"
     />
     <SelectDeviceModalGroup
       v-if="showSelectAddressModal"
@@ -48,6 +50,14 @@
         showSelectAddressModal: false,
       };
     },
+    computed: {
+      isNewFacilitySetup() {
+        return this.selected === Options.NEW;
+      },
+      isImportFacilitySetup() {
+        return this.selected === Options.IMPORT;
+      },
+    },
     methods: {
       handleContinueImport(address) {
         this.wizardService.send({
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
index ae1b0acd533..d3ad29b595a 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/UserCredentialsForm.vue
@@ -50,6 +50,7 @@
         :isValid.sync="passwordValid"
         :shouldValidate="formSubmitted"
         :showConfirmationInput="!selectedUser"
+        :shouldValidateOnEnter="false"
         autocomplete="new-password"
       />