diff --git a/search_api_saved_searches.admin.inc b/search_api_saved_searches.admin.inc
index 5f18bea..e3f4b56 100644
--- a/search_api_saved_searches.admin.inc
+++ b/search_api_saved_searches.admin.inc
@@ -94,7 +94,8 @@ You can configure your saved searches at the following address:
 
 --  [site:name] team'),
     'results' => t('New results for search "!name_token"', array('!name_token' => '[search-api-saved-search:name]')) .
-        ":\n[search-api-saved-search:items]\n[search-api-saved-search:results-capped]",
+        ":\n[search-api-saved-search:items]\n[search-api-saved-search:results-capped]" .
+        t('To delete this saved search, click here: !delete_url', array('!delete_url' => '[search-api-saved-search:delete-url]')),
     'result' => '[search-api-saved-search-result:label] ([search-api-saved-search-result:url])',
     'max_results' => 0,
     'results_capped' => "…\n" . t('View all results') . ': [search-api-saved-search:view-url]',
diff --git a/search_api_saved_searches.tokens.inc b/search_api_saved_searches.tokens.inc
index e0ff099..1c1a2d6 100644
--- a/search_api_saved_searches.tokens.inc
+++ b/search_api_saved_searches.tokens.inc
@@ -149,14 +149,22 @@ function search_api_saved_searches_tokens($type, array $tokens, array $data = ar
 
   switch ($type) {
     case 'user':
-      if (!empty($data['user']->uid)) {
-        if (isset($tokens['search-api-saved-searches-url'])) {
-          $replacements[$tokens['search-api-saved-searches-url']] = url('user/' . $data['user']->uid . '/saved-searches', $url_options);
+      if (isset($tokens['search-api-saved-searches-url'])) {
+        $url_tokens = token_find_with_prefix($tokens, 'search-api-saved-searches-url');
+        if (!empty($data['user']->uid)) {
+          $path = 'user/' . $data['user']->uid . '/saved-searches';
+          $replacements[$tokens['search-api-saved-searches-url']] = url($path, $url_options);
+          if ($url_tokens) {
+            $replacements += token_generate('url', $url_tokens, array(
+              'path' => $path,
+            ), $options);
+          }
         }
-        if ($url_tokens = token_find_with_prefix($tokens, 'search-api-saved-searches-url')) {
-          $replacements += token_generate('url', $url_tokens, array(
-            'path' => 'user/' . $data['user']->uid . '/saved-searches',
-          ), $options);
+        else {
+          $replacements[$tokens['search-api-saved-searches-url']] = '';
+          foreach ($url_tokens as $token) {
+            $replacements[$token] = '';
+          }
         }
       }
       break;