diff --git a/templates/ktcore/document/admin/force_checkin_confirm.smarty b/templates/ktcore/document/admin/force_checkin_confirm.smarty
index e3643cb..1a914cf 100644
--- a/templates/ktcore/document/admin/force_checkin_confirm.smarty
+++ b/templates/ktcore/document/admin/force_checkin_confirm.smarty
@@ -29,7 +29,6 @@
   <input type="hidden" name="fDocumentId" value="{$document->getId()}">
   <div class="form_actions">
       <input type="submit" value="{i18n}Force Checkin{/i18n}" />
-      <!-- FIXME separate this even further. -->
-      <p><a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a></p>
+      <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
   </div>
 </form>
diff --git a/templates/ktcore/folder/mass_delete.smarty b/templates/ktcore/folder/mass_delete.smarty
index e6205fc..28906d5 100644
--- a/templates/ktcore/folder/mass_delete.smarty
+++ b/templates/ktcore/folder/mass_delete.smarty
@@ -35,8 +35,8 @@ will be recorded in the documents' "Transaction History"{/i18n}.</p>
 
 <div class="form_actions">
     <input type="submit" value="Delete" />
-    <a href="{addQS}fFolderId={$folder_id}{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+    <input type="submit" name="kt_cancel[{addQS}fFolderId={$folder_id}{/addQS}]" value="Cancel" />
 </div>
 
 </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty
index 7dc43c7..d18d33d 100644
--- a/templates/ktcore/folder/permissions.smarty
+++ b/templates/ktcore/folder/permissions.smarty
@@ -95,7 +95,7 @@ value="{$iGroupId}"></td>
 <div class="form_actions">
 {if $edit}
   <input type="submit" value="{i18n}Update Permission Assignments{/i18n}" />
-  <a href="{addQS}fFolderId={$iFolderId}{/addQS}" class="ktCancelLink">Cancel</a>
+  <input type="submit" name="kt_cancel[{addQS}fFolderId={$iFolderId}{/addQS}]" value="Cancel" />
 {else}
 {* non-inherited view mode. *}
 {if ((!$inherited) && (!$edit)) }
@@ -189,4 +189,4 @@ $this->assign("aPermissions", $this->_tpl_vars['oDynamicCondition']->getAssignme
 <input type="submit" name="submit" value="{i18n}Add{/i18n}" />
 </form>
 { /if }
-{/if}
\ No newline at end of file
+{/if}
diff --git a/templates/ktcore/folder/roles_managegroups.smarty b/templates/ktcore/folder/roles_managegroups.smarty
index 6c86fef..1f4b442 100644
--- a/templates/ktcore/folder/roles_managegroups.smarty
+++ b/templates/ktcore/folder/roles_managegroups.smarty
@@ -62,7 +62,8 @@
 
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         {capture assign=link}{addQS}fFolderId={$context->oFolder->getId()}{/addQS}{/capture}
+         <input type="submit" name="kt_cancel[{$link}]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/folder/roles_manageusers.smarty b/templates/ktcore/folder/roles_manageusers.smarty
index e6fe45b..ca5dd01 100644
--- a/templates/ktcore/folder/roles_manageusers.smarty
+++ b/templates/ktcore/folder/roles_manageusers.smarty
@@ -62,7 +62,8 @@
 
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         {capture assign=link}{addQS}fFolderId={$context->oFolder->getId()}{/addQS}{/capture}
+         <input type="submit" name="kt_cancel[{$link}]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/addgroup.smarty b/templates/ktcore/principals/addgroup.smarty
index 96ed037..1dd7afb 100644
--- a/templates/ktcore/principals/addgroup.smarty
+++ b/templates/ktcore/principals/addgroup.smarty
@@ -37,7 +37,7 @@ within KnowledgeTree below.{/i18n}</p>
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}create group{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/adduser.smarty b/templates/ktcore/principals/adduser.smarty
index 456e43f..6d6fef4 100644
--- a/templates/ktcore/principals/adduser.smarty
+++ b/templates/ktcore/principals/adduser.smarty
@@ -36,7 +36,7 @@ within KnowledgeTree below.{/i18n}</p>
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}create user{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/editgroup.smarty b/templates/ktcore/principals/editgroup.smarty
index e34015f..f1ba6d7 100644
--- a/templates/ktcore/principals/editgroup.smarty
+++ b/templates/ktcore/principals/editgroup.smarty
@@ -14,7 +14,7 @@ the system's information about group <strong>#name</strong>{/i18n}</p>
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes to group{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/editunit.smarty b/templates/ktcore/principals/editunit.smarty
index 60fc32a..596bcb0 100644
--- a/templates/ktcore/principals/editunit.smarty
+++ b/templates/ktcore/principals/editunit.smarty
@@ -14,7 +14,7 @@ the system's information about unit <strong>#name#</strong>{/i18n}</p>
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes to unit{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/edituser.smarty b/templates/ktcore/principals/edituser.smarty
index 1da9591..f06cd40 100644
--- a/templates/ktcore/principals/edituser.smarty
+++ b/templates/ktcore/principals/edituser.smarty
@@ -12,7 +12,7 @@
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/groups_managesubgroups.smarty b/templates/ktcore/principals/groups_managesubgroups.smarty
index 41b3bc7..856d27e 100644
--- a/templates/ktcore/principals/groups_managesubgroups.smarty
+++ b/templates/ktcore/principals/groups_managesubgroups.smarty
@@ -63,7 +63,7 @@
 
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/groups_manageusers.smarty b/templates/ktcore/principals/groups_manageusers.smarty
index 23ade67..8efaf8b 100644
--- a/templates/ktcore/principals/groups_manageusers.smarty
+++ b/templates/ktcore/principals/groups_manageusers.smarty
@@ -62,7 +62,7 @@
 
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktcore/principals/roleadmin.smarty b/templates/ktcore/principals/roleadmin.smarty
index 3eac61a..d4dff51 100644
--- a/templates/ktcore/principals/roleadmin.smarty
+++ b/templates/ktcore/principals/roleadmin.smarty
@@ -35,7 +35,7 @@
    
    <div class="form_actions">
       <input type="submit" value="{i18n}update role information{/i18n}" />
-      <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+      <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
    </div class="form_actions">
 </fieldset>
 </form>
diff --git a/templates/ktcore/principals/updatepassword.smarty b/templates/ktcore/principals/updatepassword.smarty
index f21f54d..cfc15d1 100644
--- a/templates/ktcore/principals/updatepassword.smarty
+++ b/templates/ktcore/principals/updatepassword.smarty
@@ -12,7 +12,7 @@
       
       <div class="form_actions">
          <input type="submit" value="{i18n}change password{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
 </form>
diff --git a/templates/ktcore/principals/usergroups.smarty b/templates/ktcore/principals/usergroups.smarty
index 9fffaea..287d7f5 100644
--- a/templates/ktcore/principals/usergroups.smarty
+++ b/templates/ktcore/principals/usergroups.smarty
@@ -64,7 +64,7 @@
 
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktstandard/authentication/ldapaddgroup.smarty b/templates/ktstandard/authentication/ldapaddgroup.smarty
index a513f20..f4cc7c4 100644
--- a/templates/ktstandard/authentication/ldapaddgroup.smarty
+++ b/templates/ktstandard/authentication/ldapaddgroup.smarty
@@ -10,7 +10,7 @@
       <input type="hidden" name="dn" value="{$dn}" />
       <div class="form_actions">
          <input type="submit" name="submit[create]" value="{i18n}create group{/i18n}" />
-         <a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktstandard/authentication/ldapadduser.smarty b/templates/ktstandard/authentication/ldapadduser.smarty
index 748b352..8b055d2 100644
--- a/templates/ktstandard/authentication/ldapadduser.smarty
+++ b/templates/ktstandard/authentication/ldapadduser.smarty
@@ -11,7 +11,7 @@
       <input type="hidden" name="samaccountname" value="{$samaccountname}" />
       <div class="form_actions">
          <input type="submit" name="submit[create]" value="{i18n}create user{/i18n}" />
-         <a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>
    </form>