CLSN-1776 : email pincode issues