diff --git a/disaster_recovery/actions/views.py b/disaster_recovery/actions/views.py
index 8115720..121fad0 100644
--- a/disaster_recovery/actions/views.py
+++ b/disaster_recovery/actions/views.py
@@ -68,9 +68,10 @@ class ActionWorkflowView(workflows.WorkflowView):
                 self.kwargs['action_id'], json=True)
             initial.update(**action['freezer_action'])
             initial.update({
-                "mandatory": action['mandatory'],
-                "max_retries": action['max_retries'],
-                "max_retries_interval": action['max_retries_interval']
+                "mandatory": action.get('mandatory', None),
+                "max_retries": action.get('max_retries', None),
+                "max_retries_interval":
+                    action.get('max_retries_interval', None)
             })
             initial.update({'action_id': action['action_id']})
         return initial
diff --git a/disaster_recovery/api/api.py b/disaster_recovery/api/api.py
index 75b8e32..858745c 100644
--- a/disaster_recovery/api/api.py
+++ b/disaster_recovery/api/api.py
@@ -388,6 +388,7 @@ class Action(object):
         utils.assign_and_remove(action, action_rules, 'max_retries_interval')
         utils.assign_and_remove(action, action_rules, 'mandatory')
         action = utils.create_dict(**action)
+        action.pop('action_id', None)
         action = {'freezer_action': action}
         return self.client.actions.create(action)