Vault support too
Fix config glitch