Fixed issue with E-mail address and displayname being swapped