Better messaging around vault