Fix switched password forms

Password form for Manual Proxy was showing/saving the HTTPS password, and vice-versa.
Improvement in asking of master-password.
- Closes #1356
Merge pull request #1367 from psyvisions/patch-1

[StatusBarIcons] Fix switched proxy manager password forms.