changed the column of email address to username; fix SDEV-333