Fixed issue with Email adres being swapped with the displayname field