Really fix login issue this time.