Added code to handle Email placeholder