Fix the registration process