Addition of ##email## field in templates