diff --git a/templates/ktcore/manage_folder_permissions.smarty b/templates/ktcore/folder/permissions.smarty
index 3e63adf..b4ab478 100644
--- a/templates/ktcore/manage_folder_permissions.smarty
+++ b/templates/ktcore/folder/permissions.smarty
@@ -45,11 +45,11 @@ td.false { background-color: #ffaaaa; text-align: centre }
 </thead>
 <tbody>
 { foreach item=oGroup from=$groups }
-<td>{$oGroup->getID()} / {$oGroup->getName()}</td>
-  { assign var=iGroupID value=$oGroup->getID() }
+<td>{$oGroup->getId()} / {$oGroup->getName()}</td>
+  { assign var=iGroupId value=$oGroup->getId() }
   { foreach item=oPerm from=$permissions }
-    { assign var=iPermID value=$oPerm->getID() }
-    { assign var=bHasPerm value=$aMapPermissionGroup[$iPermID][$iGroupID] }
+    { assign var=iPermId value=$oPerm->getId() }
+    { assign var=bHasPerm value=$aMapPermissionGroup[$iPermId][$iGroupId] }
 { if $bHasPerm }
 <td class="true">True</td>
 { else }
@@ -67,10 +67,10 @@ padding: 2px; padding-right: 1em; padding-left: 1em">
 { if $inherited }
 Inherited from {$inherited}
 [<a
-href="{$smarty.server.PHP_SELF}?action=copyPermissions&fFolderID={$iFolderID}">Copy</a>]
+href="{$smarty.server.PHP_SELF}?action=copyPermissions&fFolderId={$iFolderId}">Copy</a>]
 { else }
 [<a
-href="{$smarty.server.PHP_SELF}?action=inheritPermissions&fFolderID={$iFolderID}">Use
+href="{$smarty.server.PHP_SELF}?action=inheritPermissions&fFolderId={$iFolderId}">Use
 parent's permissions</a>]
 { /if }
 </span>
@@ -81,7 +81,7 @@ parent's permissions</a>]
 <div class="edit" id="edit">
 <form method="POST">
 <input type="hidden" name="action" value="update">
-<input type="hidden" name="fFolderID" value="{$iFolderID}">
+<input type="hidden" name="fFolderId" value="{$iFolderId}">
 <table class="pretty" cellspacing="0" cellpadding="0" border="0" width="100%">
 <thead>
 <tr>
@@ -93,17 +93,17 @@ parent's permissions</a>]
 </thead>
 <tbody>
 { foreach item=oGroup from=$groups }
-<td>{$oGroup->getID()} / {$oGroup->getName()}</td>
-  { assign var=iGroupID value=$oGroup->getID() }
+<td>{$oGroup->getId()} / {$oGroup->getName()}</td>
+  { assign var=iGroupId value=$oGroup->getId() }
   { foreach item=oPerm from=$permissions }
-    { assign var=iPermID value=$oPerm->getID() }
-    { assign var=bHasPerm value=$aMapPermissionGroup[$iPermID][$iGroupID] }
+    { assign var=iPermId value=$oPerm->getId() }
+    { assign var=bHasPerm value=$aMapPermissionGroup[$iPermId][$iGroupId] }
 { if $bHasPerm }
-<td class="true"><input type="checkbox" name="foo[{$iPermID}][group][]"
-value="{$iGroupID}" checked="true"></td>
+<td class="true"><input type="checkbox" name="foo[{$iPermId}][group][]"
+value="{$iGroupId}" checked="true"></td>
 { else }
-<td class="false"><input type="checkbox" name="foo[{$iPermID}][group][]"
-value="{$iGroupID}"></td>
+<td class="false"><input type="checkbox" name="foo[{$iPermId}][group][]"
+value="{$iGroupId}"></td>
 { /if }
   { /foreach }
 </tr>
@@ -116,6 +116,73 @@ value="{$iGroupID}"></td>
 </div>
 { /if }
 
+<h2>Dynamic permissions</h2>
+
+{ if $dynamic_conditions }
+<table class="pretty" cellpadding="0" cellspacing="0">
+  <thead>
+    <tr>
+      <th>Group</th>
+      <th>Condition</th>
+{foreach from=$permissions item=oPerm}
+      <th title="{$oPerm->sName}">{$oPerm->sHumanName}</th>
+{/foreach}
+    </tr>
+  </thead>
+  <tbody>
+{ foreach from=$dynamic_conditions item=oDynamicCondition }
+    <tr>
+{php}
+$this->assign("oGroup", Group::get($this->_tpl_vars['oDynamicCondition']->getGroupId()));
+$this->assign("oCondition", KTSavedSearch::get($this->_tpl_vars['oDynamicCondition']->getConditionId()));
+$this->assign("aPermissions", $this->_tpl_vars['oDynamicCondition']->getAssignment());
+{/php}
+    <td>{$oGroup->getName()}</td>
+    <td>{$oCondition->getName()}</td>
+{foreach from=$permissions item=oPerm}
+  {assign var=bHasPerm value=$oPerm->getId()|in_array:$aPermissions}
+  { if $bHasPerm }
+    <td class="true">True</td>
+  { else }
+    <td class="false">False</td>
+  { /if }
+{/foreach}
+    </tr>
+{ /foreach }
+  </tbody>
+</table>
+{ /if }
+
+{ if $edit }
+<h3>Add a new dynamic permission</h3>
+<form>
+<table class="pretty" cellpadding="0" cellspacing="0">
+<input type="hidden" name="action" value="newDynamicPermission" />
+<input type="hidden" name="fFolderId" value="{$iFolderId}" />
+<thead>
+<tr>
+  <th>Group</th>
+  <th>Condition</th>
+{foreach from=$permissions item=oPerm}
+  <th title="{$oPerm->sName}">{$oPerm->sHumanName}</th>
+{/foreach}
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td>{entity_select entities=$groups name=fGroupId none=true}</td>
+  <td>{entity_select entities=$conditions name=fConditionId none=true}</td>
+{entity_checkboxes entities=$permissions name=fPermissionIds assign=aPermissionCheckboxes method="none"}
+{foreach from=$aPermissionCheckboxes item=sCheckbox}
+  <td>{$sCheckbox}</td>
+{/foreach}
+</tr>
+</tbody>
+</table>
+<input type="submit" name="submit" value="Add" />
+</form>
+{ /if }
+
 <h2>User permissions</h2>
 
 <div>
@@ -130,11 +197,11 @@ value="{$iGroupID}"></td>
 </thead>
 <tbody>
 { foreach item=oUser from=$users }
-<td>{$oUser->getID()} / {$oUser->getName()}</td>
-  { assign var=iUserID value=$oUser->getID() }
+<td>{$oUser->getId()} / {$oUser->getName()}</td>
+  { assign var=iUserId value=$oUser->getId() }
   { foreach item=oPerm from=$permissions }
-    { assign var=iPermID value=$oPerm->getID() }
-    { assign var=bHasPerm value=$aMapPermissionUser[$iPermID][$iUserID] }
+    { assign var=iPermId value=$oPerm->getId() }
+    { assign var=bHasPerm value=$aMapPermissionUser[$iPermId][$iUserId] }
 { if $bHasPerm }
 <td class="true">True</td>
 { else }