TMDM-7974: Using CryptoHelper instead of PasswordEncryptUtil