Fixing a couple cases where emails were normalized via normalizeUsername, stripping their @ symbols.