Merge "registration: Refactor validation logic to avoid duplication"