hotfix for other email domains