feat(2638): added conditions for no-vault approach

feat(2638): added conditions for no-vault approach #1489