Fix for login problems