Add support for wrapped password fields