1 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/notification/FormTypeEventForwarder.java b/src/org/traccar/notification/FormTypeEventForwarder.java
index d2c4aa691..e7564885d 100644
--- a/src/org/traccar/notification/FormTypeEventForwarder.java
+++ b/src/org/traccar/notification/FormTypeEventForwarder.java
@@ -17,8 +17,12 @@ public class FormTypeEventForwarder extends EventForwarder {
         if (!getAdditionalParams().equals("")) {
             requestBuilder.setFormParams(splitParams(getAdditionalParams(), "="));
         }
-        requestBuilder.addFormParam(getPayloadParamName(),
-                NotificationFormatter.formatForwarderMessage(event, position));
+
+        String payload = isUseTemplatesForPayload()
+                ? NotificationFormatter.formatForwarderMessage(event, position)
+                : prepareJsonPayload(event, position);
+
+        requestBuilder.addFormParam(getPayloadParamName(), payload);
     }
 
 }