diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java
index 5e20ae3881..4d757ed045 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java
@@ -82,7 +82,8 @@
 public class TransformService extends AbstractService implements ITransformService {
     private static final String NODE_FILTER_BSH = "filter = null; if (engine != null && engine.getExtensionService() != null) " +
             "filter = engine.getExtensionService().getExtensionPoint(org.jumpmind.symmetric.security.INodePasswordFilter.class); " +
-            "if (filter != null) return filter.%s(currentValue, engine.getNodeId()); else return currentValue;";
+            "identity = engine.getNodeService().getCachedIdentity(); " +
+            "if (filter != null) return filter.%s(currentValue, identity == null ? null : identity.getNodeId()); else return currentValue;";
     private static final String SMTP_PASSWORD_BSH = "if (sourceDmlTypeString.equalsIgnoreCase(\"insert\") || sourceDmlTypeString.equalsIgnoreCase(\"update\")) {"
             + "if (PARAM_KEY.equalsIgnoreCase(\"smtp.password\")) {"
             + "filter = null; if (engine != null && engine.getExtensionService() != null) " +