check mail and remove uid
Merge pull request #4 from athuan/fix-remove-uid

check mail and remove uid