Really fix login