Merge pull request #1713 from stevewithington/candidate

admin user cleanup