Only modify password when one has been specified

Obvious fix
Updated unit test for user provider pw
Merge pull request #1455 from anandsuresh/pw-user-provider-fix

Only modify password when one has been specified