Multiple Bug fixes: verification of cc/email; pin fix; context.xml removal

Signed-off-by: Shivam Garg <sgarg@cse.unsw.EDU.AU>