merged in email fixes
rescue in vote migration