Some minor fixes in registration flow