Followup to commit 5708b43c7c477fb344f3f01d2c23a835313f8e99
Improving UX during registration