fix(restore): use custom type for sensitive fields

fix(restore): use custom type for sensitive fields #8154