diff --git a/resources/js/kt-utility.js b/resources/js/kt-utility.js
index 1c3e730..857a2e9 100644
--- a/resources/js/kt-utility.js
+++ b/resources/js/kt-utility.js
@@ -10,6 +10,11 @@ function initDeleteProtection(message) {
     
     function setClickFunction(fn, node) {
         // addToCallStack(node,'onClick',fn);
+        if (node.tagName == 'SPAN') {
+            var ahrefs = node.getElementsByTagName('A');
+            if (ahrefs.length == 1) { node = ahrefs[0]; }
+            else { return null; }
+        }
         if (isUndefinedOrNull(node.onclick)) { 
             node.onclick = fn;
         }
@@ -17,4 +22,8 @@ function initDeleteProtection(message) {
     
     forEach(elements, partial(setClickFunction, fn));
     
+    elements = getElementsByTagAndClassName('SPAN', 'ktDelete');
+    
+    forEach(elements, partial(setClickFunction, fn));
+    
 }
\ No newline at end of file
diff --git a/templates/ktcore/principals/groupadmin.smarty b/templates/ktcore/principals/groupadmin.smarty
index 08eda19..9d25ee9 100644
--- a/templates/ktcore/principals/groupadmin.smarty
+++ b/templates/ktcore/principals/groupadmin.smarty
@@ -8,6 +8,7 @@ number of different users at once.{/i18n}</p>
 </fieldset>
 <!-- we roll both in here. -->
 <form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="do_search" value="1" />
 <fieldset>
 <legend>{i18n}Search for groups{/i18n}</legend>
 <p class="descriptiveText">{i18n}Since there may be many groups in the
diff --git a/templates/ktcore/workflow/manageStates.smarty b/templates/ktcore/workflow/manageStates.smarty
index 089cc42..667e3df 100644
--- a/templates/ktcore/workflow/manageStates.smarty
+++ b/templates/ktcore/workflow/manageStates.smarty
@@ -13,9 +13,8 @@ while the workflow has no documents or document-versions assigned to the workflo
 <legend>Create a new state</legend>
 <p class="descriptiveText">A critical part of workflow is the creation of
 various different states for documents.</p>
-<a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}"
-   class="ktAction ktInline ktAdd">{i18n}Create a new state{/i18n}</a>
-<a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Create a new state{/i18n}</a>
+<span class="ktActionLink ktAdd"><a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}"
+   >{i18n}Create a new state{/i18n}</a></span>
 
 </fieldset>