1 files changed, 3 insertions, 6 deletions

diff --git a/client/src/app/+signup/+register/custom-stepper.component.ts b/client/src/app/+signup/+register/custom-stepper.component.ts
index 3b7ba40e8..4c308f7b6 100644
--- a/client/src/app/+signup/+register/custom-stepper.component.ts
+++ b/client/src/app/+signup/+register/custom-stepper.component.ts
@@ -14,13 +14,10 @@ export class CustomStepperComponent extends CdkStepper {
   }
 
   isCompleted (step: CdkStep) {
-    return step.stepControl?.dirty && step.stepControl.valid
+    return step.completed
   }
 
-  isAccessible (index: number) {
-    const stepsCompletedMap = this.steps.map(step => this.isCompleted(step))
-    return index === 0
-      ? true
-      : stepsCompletedMap[index - 1]
+  isAccessible (step: CdkStep) {
+    return step.editable && step.completed
   }
 }