Improve login process