Fixes master password passing