Merge pull request #71 from pkkup/master

make delete email and set primary email work without forms, using custom...