fixes issue with user management and passwords
Merge pull request #113 from Align/matt-dev

fixes issue with user management and passwords