Processed options from extension password protect.
Some minor other changes.
Authored by: harm10 2014-12-14
Parent: [r4399]
Child: [r4401]
