Update client to be consistent with passport branch