Fixed a bug with givenName population