diff --git a/presentation/lookAndFeel/knowledgeTree/administration/workflow/workflows.php b/presentation/lookAndFeel/knowledgeTree/administration/workflow/workflows.php
index 851df8b..0903fad 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/workflow/workflows.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/workflow/workflows.php
@@ -15,6 +15,7 @@ require_once(KT_DIR . "/presentation/webpageTemplate.inc");
 require_once(KT_LIB_DIR . '/permissions/permission.inc.php');
 require_once(KT_LIB_DIR . '/groups/Group.inc');
 require_once(KT_LIB_DIR . '/roles/Role.inc');
+require_once(KT_LIB_DIR . '/search/savedsearch.inc.php');
 
 class KTWorkflowDispatcher extends KTStandardDispatcher {
     var $bAutomaticTransaction = true;
@@ -318,6 +319,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
             'aPermissions' => KTPermission::getList(),
             'aGroups' => Group::getList(),
             'aRoles' => Role::getList(),
+            'aConditions' => KTSavedSearch::getConditions(),
         ));
         return $oTemplate;
     }
@@ -335,6 +337,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
         $iPermissionId = KTUtil::arrayGet($_REQUEST, 'fPermissionId', null);
         $iGroupId = KTUtil::arrayGet($_REQUEST, 'fGroupId', null);
         $iRoleId = KTUtil::arrayGet($_REQUEST, 'fRoleId', null);
+        $iConditionId = KTUtil::arrayGet($_REQUEST, 'fConditionId', null);
         if ($iPermissionId) {
             $this->oValidator->validatePermission($_REQUEST['fPermissionId']);
         }
@@ -344,6 +347,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
         if ($iRoleId) {
             $this->oValidator->validateRole($_REQUEST['fRoleId']);
         }
+        if ($iConditionId) {
+            $this->oValidator->validateCondition($_REQUEST['fConditionId']);
+        }
         $oTransition->updateFromArray(array(
             'workflowid' => $oWorkflow->getId(),
             'name' => $_REQUEST['fName'],
@@ -352,6 +358,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
             'guardpermissionid' => $iPermissionId,
             'guardgroupid' => $iGroupId,
             'guardroleid' => $iRoleId,
+            'guardconditionid' => $iConditionId,
         ));
         $res = $oTransition->update();
         $this->oValidator->notErrorFalse($res, array(
diff --git a/templates/ktcore/workflow/editTransition.smarty b/templates/ktcore/workflow/editTransition.smarty
index 2f3f57e..1d473e7 100644
--- a/templates/ktcore/workflow/editTransition.smarty
+++ b/templates/ktcore/workflow/editTransition.smarty
@@ -29,11 +29,20 @@ none=true}</td>
   <td>{entity_select entities=$aGroups
 selected=$oTransition->getGuardGroupId() name="fGroupId" none=true}</td>
 </tr>
+{if $aRoles}
 <tr>
   <th>Guard Role</th>
   <td>{entity_select entities=$aRoles
 selected=$oTransition->getGuardRoleId() name="fRoleId" none=true}</td>
 </tr>
+{/if}
+{if $aConditions}
+<tr>
+  <th>Guard Condition</th>
+  <td>{entity_select entities=$aConditions
+selected=$oTransition->getGuardConditionId() name="fConditionId" none=true}</td>
+</tr>
+{/if}
 </table>
 <input type="submit" name="submit" value="Save" />
 </form>