diff --git a/src/modules/Workers/WebService/WebService.cpp b/src/modules/Workers/WebService/WebService.cpp
index e8caa5b..2311ea3 100644
--- a/src/modules/Workers/WebService/WebService.cpp
+++ b/src/modules/Workers/WebService/WebService.cpp
@@ -726,7 +726,11 @@ namespace Apostol {
 
                     const CJSONValue &jsonFeedback = jsonData["feedback"];
 
-                    const auto &formFeedbackLeaveBefore = jsonFeedback["leave-before"].AsString();
+                    CString Key("leave_before");
+                    if (!jsonFeedback.HasOwnProperty(Key))
+                        Key = "leave-before";
+
+                    const auto &formFeedbackLeaveBefore = jsonFeedback[Key].AsString();
                     const auto &formFeedbackStatus = jsonFeedback["status"].AsString();
                     const auto &formFeedbackComments = jsonFeedback["comments"].AsString();
                     const auto &formFeedbackRefund = jsonFeedback["refund"].AsString();
diff --git a/src/modules/Workers/WebSocket/WebSocket.cpp b/src/modules/Workers/WebSocket/WebSocket.cpp
index f5a6006..24001d1 100644
--- a/src/modules/Workers/WebSocket/WebSocket.cpp
+++ b/src/modules/Workers/WebSocket/WebSocket.cpp
@@ -813,7 +813,11 @@ namespace Apostol {
 
                     const CJSONValue &jsonFeedback = jsonData["feedback"];
 
-                    const auto &formFeedbackLeaveBefore = jsonFeedback["leave-before"].AsString();
+                    CString Key("leave_before");
+                    if (!jsonFeedback.HasOwnProperty(Key))
+                        Key = "leave-before";
+
+                    const auto &formFeedbackLeaveBefore = jsonFeedback[Key].AsString();
                     const auto &formFeedbackStatus = jsonFeedback["status"].AsString();
                     const auto &formFeedbackComments = jsonFeedback["comments"].AsString();