Added email format (without IP-address) support