Separate userAccount and auth-method.  Add UID.