diff --git a/lib/templating/smartytemplate.inc.php b/lib/templating/smartytemplate.inc.php
index d675b3a..1cc3a85 100644
--- a/lib/templating/smartytemplate.inc.php
+++ b/lib/templating/smartytemplate.inc.php
@@ -8,31 +8,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  */
@@ -104,6 +104,8 @@ class KTSmartyTemplate extends KTTemplate {
 			$_SESSION['search2_quickQuery'] = '';
         }
 
+        $smarty->assign('search2_anonymous', !array_key_exists('userID', $_SESSION) || ($_SESSION['userID'] == -2));
+        $smarty->assign('search2_user', $_SESSION['userId']);
         $smarty->assign('search2_quick', $search2_quick);
         $smarty->assign('search2_general', $search2_general);
         $smarty->assign('search2_quickQuery', $search2_quickQuery);
diff --git a/templates/ktcore/search2/search_portlet.smarty b/templates/ktcore/search2/search_portlet.smarty
index 0e0297e..95f567b 100644
--- a/templates/ktcore/search2/search_portlet.smarty
+++ b/templates/ktcore/search2/search_portlet.smarty
@@ -4,7 +4,9 @@
 <ul class="actionlist">
 <li><a href="{$rootUrl}/search2.php?action=guiBuilder">{i18n}Advanced Search{/i18n}</a></li>
 <li><a href="{$rootUrl}/search2.php?action=queryBuilder">{i18n}Search Criteria Editor{/i18n}</a></li>
+{if !$search2_anonymous}
 <li><a href="{$rootUrl}/search2.php?action=manage"><nobr>{i18n}Manage Saved Search{/i18n}</a></li>
+{/if}
 </ul>
 
 {if (count($savedSearches) > 0)}
diff --git a/templates/ktcore/search2/search_results.smarty b/templates/ktcore/search2/search_results.smarty
index 84d65a7..9215996 100755
--- a/templates/ktcore/search2/search_results.smarty
+++ b/templates/ktcore/search2/search_results.smarty
@@ -13,7 +13,7 @@
     {/capture}
 	{i18n arg_options=$options}Use the #options# to extend your search criteria.{/i18n}
 {/if}
-{if !empty($iSavedID)}
+{if !$search2_anonymous && !empty($iSavedID)}
 	{capture assign=options}
     	<a href="{addQS}action=queryBuilder&fSavedSearchId={$iSavedID}{/addQS}">Query Editor</a>
     {/capture}
@@ -22,7 +22,7 @@
 	<font color=brown><div id="savedSearch" style="display: none">{i18n}The search criteria has been saved.{/i18n}</div></font>
 </fieldset>
 <br>
-{if !empty($iSavedID)}
+{if !$search2_anonymous && !empty($iSavedID)}
 <fieldset>
 	<legend>{i18n}Saved Search{/i18n}</legend>
 	{i18n}This is the saved search criteria:{/i18n} {$txtSavedName}. <br/>
@@ -98,7 +98,7 @@ function onShowAll(showall)
 {/literal}
 </div>
 </div>
-{if empty($iSavedID)}
+{if !$search2_anonymous && empty($iSavedID)}
 <div id="saveSearch">
 <fieldset>
 	<legend>{i18n}You can save this search:{/i18n}</legend>