Replaced username with email