Make login process cleaner with better feedback