Fix registration user journey