Some minor changes
Fixed the user email bug
Merge pull request #2 from dbohn/userAdministration

User administration