Addresses #6579 Only strip vault passwords if given