Rewrote the whole validation for step 2 registration