Move user-full-name and user-mail-address to upfront