Fixed issue with email in public view