Fix client login issues