Bug 901444
Fixing bad merge
Handle numbers for users and passwords
Merge pull request #1281 from danmcp/master

Bug 901444