Improve UX on login