diff --git a/application/controllers/ApprovalchainmanagerController.php b/application/controllers/ApprovalchainmanagerController.php
index e07882dc7161979ff46596503d7ff8b2352faeb6..edd354f28325a4b6d698cd46ce7216ab86a9b503 100644
--- a/application/controllers/ApprovalchainmanagerController.php
+++ b/application/controllers/ApprovalchainmanagerController.php
@@ -170,6 +170,8 @@ class ApprovalChainManagerController extends Nmc_Controller_Action
             $currentLink->currentAction = $currentAction;
             if ($currentLinkData['currentState'] != '_null') {
                 $currentLink->currentState = $currentLinkData['currentState'];
+            } else {
+                $currentLink->currentState = null;
             }
             $currentLink->nextAction = $nextAction;
             $currentLink->save();
diff --git a/document_root/javascript/approval_chain_manager.js b/document_root/javascript/approval_chain_manager.js
index 7fa9e3513a490199db6e771137ea2d79da07740c..0be46bdc72fb07013bb99b47f370bbdb7e55bbf2 100644
--- a/document_root/javascript/approval_chain_manager.js
+++ b/document_root/javascript/approval_chain_manager.js
@@ -11,6 +11,7 @@ var actionTypeSelectAjaxResponder = AjaxClient.extend(
         }
 
         this.selectElement.options.length = 0;
+        this.selectElement.add(new Option('--N/A--', '_null', false, false), null);
         for (var i = 0; i < resultStrings.length; i++) {
             var resultString = resultStrings[i]
             this.selectElement.add(new Option(resultString, resultString, false, false), null);
@@ -166,7 +167,7 @@ function updateActionResults()
 {
     var actionResultElement = this.parentNode;
     for(actionResultElement = actionResultElement.nextSibling;
-        actionResultElement.nodeName != 'TD';
+        actionResultElement.nodeName != 'td';
         actionResultElement = actionResultElement.nextSibling);
 
     actionResultElement = actionResultElement.getElementsByTagName('select').item(0);