Improved password prompt
Merge pull request #3527 from timvandermeij/better-password-prompt

Improved password prompt