Improve register UX