CLSN-1776 : pincode issue emailer + moved code around