Fix for the recent change to the login process