Ensure master password is asked for upfront; don't semi-load layer