Improvement in asking of master-password.
- Closes #1356