diff --git a/src/WebDialogs/client/webdialogs_keywords.py b/src/WebDialogs/client/webdialogs_keywords.py
index 3799437..12249f3 100644
--- a/src/WebDialogs/client/webdialogs_keywords.py
+++ b/src/WebDialogs/client/webdialogs_keywords.py
@@ -51,6 +51,6 @@ def pause_execution(self, message):
         return self.client_backend.get_response()
 
     @keyword("Execute Custom Step")
-    def execute_custom_step(self, step):
-        self.client_backend.create_dialog("execute_custom_step", "Custom Step", step=step)
+    def execute_custom_step(self, step, data=None):
+        self.client_backend.create_dialog("execute_custom_step", "Custom Step", step=step, data=data)
         return self.client_backend.get_response()
diff --git a/src/WebDialogs/server/services/dialogs/base.py b/src/WebDialogs/server/services/dialogs/base.py
index 5d49c81..b2de525 100644
--- a/src/WebDialogs/server/services/dialogs/base.py
+++ b/src/WebDialogs/server/services/dialogs/base.py
@@ -18,9 +18,10 @@ def get_response(self):
 class CustomStepDialog(Dialog):
     template = None
 
-    def __init__(self, message="", step=""):
+    def __init__(self, message="", step="", data=None):
         super().__init__(message)
         self.step = step
+        self.data = data
         self.template = f"custom/{step}.html"