ReSend Email fix
Merge branch 'ReSendEmail'