Patch to support password fields