Full fix for login