Fixing regex for email and zip to allow empty values