Fix 313; note that the password field is not sync'd