diff --git a/src/client/app/charts/order-dialog.js b/src/client/app/charts/order-dialog.js
index 4d63d8a5..aa73ca19 100644
--- a/src/client/app/charts/order-dialog.js
+++ b/src/client/app/charts/order-dialog.js
@@ -120,7 +120,7 @@
 
             if (order.type === "LIMIT") {
                 order.price = vm.quote + "";
-                order.expiry = new Date(Date.now() + vm.selectedExpire);
+                order.gtdTime = new Date(Date.now() + vm.selectedExpire);
             }
 
             if (isMeasurePips) {
@@ -195,7 +195,9 @@
                         toastService.show(message);
                     } else {
                         opened = transaction.orderFillTransaction ||
-                            transaction.orderFillTransaction;
+                            transaction.orderFillTransaction ||
+                            transaction.orderCreateTransaction;
+
                         side = opened.units > 0 ? "buy" : "sell";
                         message = side + " " +
                             opened.instrument +