Improved login/signin behaviour