Better incorporate the fields from SSO into the UI