(CONT-581) Adding deferred function support for password field