The Vault: Bugfix for new feature implementation

Simple changes to implement a new feature.