diff --git a/Framework/Built_In_Automation/Sequential_Actions/common_functions.py b/Framework/Built_In_Automation/Sequential_Actions/common_functions.py
index 9a67aa40b..59ab47fe9 100755
--- a/Framework/Built_In_Automation/Sequential_Actions/common_functions.py
+++ b/Framework/Built_In_Automation/Sequential_Actions/common_functions.py
@@ -4096,7 +4096,7 @@ def perform_mod(op, val, t):
             return t
 
         for left,mid,right in data_set:
-            if "current format" == left.lower():
+            if "current format" == left.lower() or "format" == left.lower():
                 current_format = right
             if "target format" == left.lower():
                 target_format = right
@@ -4113,6 +4113,7 @@ def perform_mod(op, val, t):
             if "data" in left:
                 if right.strip().lower() == "today":
                     data = datetime.today()
+                    _current_format = current_format
                 elif right.strip().lower() in ("monday","tuesday","wednesday","thursday","friday","saturday","sunday"):
                     data = parser.parse(right.strip())
                 else: