Fixed bug where e-mail address contains ' character