Login service fixes