Further improved login error handling