Vault bugfix if clientcode is wrong