Correcting overly optimistic login