Don't send the password to the user
Check whether password is null
Merge pull request #389 from LeovR/patch-6

Don't send the password to the user