DDF-734 added password decrypt back in