diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index 13933431c..4285f7ebf 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -184,6 +184,7 @@
 			<img src="resource2/{$opt.template.style}/images/viewcache/date.png" class="icon16" alt="" title="" align="middle" />&nbsp;{if $cache.is_publishdate==0}{t}Listed since{/t}{else}{t}Published on{/t}{/if}: {$cache.datecreated|date_format:$opt.format.datelong}<br />
 			<img src="resource2/{$opt.template.style}/images/viewcache/date.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Last update{/t}: {$cache.lastmodified|date_format:$opt.format.datelong}<br />
 			<img src="resource2/{$opt.template.style}/images/viewcache/arrow_in.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Waypoint{/t}: <b>{$cache.wpoc}</b><br />
+			<img src="resource2/{$opt.template.style}/images/viewcache/link.png" class="icon16" alt="" title="" align="middle" />&nbsp;{t}Shorturl{/t}: <a href="http://opencaching.de/{$cache.wpoc}">http://opencaching.de/{$cache.wpoc}</a><br />
 			{if $cache.wpgc!='' || $cache.wpnc!=''}<img src="resource2/{$opt.template.style}/images/viewcache/link.png" class="icon16" alt="" title="" align="middle" />
 				{t}Also listed at{/t}:
 				{if $cache.wpgc!=''}
diff --git a/htdocs/util/notification/notify_newcache.email b/htdocs/util/notification/notify_newcache.email
index 04fb9727c..6469fad46 100644
--- a/htdocs/util/notification/notify_newcache.email
+++ b/htdocs/util/notification/notify_newcache.email
@@ -7,7 +7,7 @@ Entfernung: {distance} {unit} Richtung {bearing}
 Typ: {cachetype}
 Größe: {cachesize}
 
-Link: http://www.opencaching.de/viewcache.php?wp={wp_oc}
+Link: http://opencaching.de/{wp_oc}
 ---
 
 
@@ -22,4 +22,4 @@ Diese E-Mail wurde automatisch generiert - bitte nicht antworten. Falls du
 Kontakt mit Opencaching.de aufnehmen möchtest, kannst unter
 http://www.opencaching.de/articles.php?page=contact alle Möglichkeiten
 nachlesen. In dringenden Fällen kannst du die E-Mail-Adresse
-contact@opencaching.de verwenden.
\ No newline at end of file
+contact@opencaching.de verwenden.
diff --git a/htdocs/util/watchlist/runwatch.php b/htdocs/util/watchlist/runwatch.php
index c7e56da97..51d53b35e 100755
--- a/htdocs/util/watchlist/runwatch.php
+++ b/htdocs/util/watchlist/runwatch.php
@@ -202,7 +202,7 @@ function process_owner_log($user_id, $log_id)
 
 //	echo "process_owner_log($user_id, $log_id)\n";
 	
-	$rsLog = sql("SELECT cache_logs.cache_id cache_id, cache_logs.text text, cache_logs.text_html text_html, cache_logs.date logdate, user.username username, caches.name cachename FROM `cache_logs`, `user`, `caches` WHERE (cache_logs.user_id = user.user_id) AND (cache_logs.cache_id = caches.cache_id) AND (cache_logs.id ='&1')", $log_id);
+	$rsLog = sql("SELECT cache_logs.cache_id cache_id, cache_logs.text text, cache_logs.text_html text_html, cache_logs.date logdate, user.username username, caches.name cachename, caches.wp_oc wp_oc FROM `cache_logs`, `user`, `caches` WHERE (cache_logs.user_id = user.user_id) AND (cache_logs.cache_id = caches.cache_id) AND (cache_logs.id ='&1')", $log_id);
 	$rLog = sql_fetch_array($rsLog);
 	mysql_free_result($rsLog);
 	
@@ -226,7 +226,7 @@ function process_owner_log($user_id, $log_id)
 	}
 	
 	$watchtext = mb_ereg_replace('{date}', date('d.m.Y', strtotime($rLog['logdate'])), $watchtext);
-	$watchtext = mb_ereg_replace('{cacheid}', $rLog['cache_id'], $watchtext);
+	$watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
 	$watchtext = mb_ereg_replace('{text}', $logtext, $watchtext);
 	$watchtext = mb_ereg_replace('{user}', $rLog['username'], $watchtext);
 	$watchtext = mb_ereg_replace('{cachename}', $rLog['cachename'], $watchtext);
diff --git a/htdocs/util/watchlist/settings-dist.inc.php b/htdocs/util/watchlist/settings-dist.inc.php
index 6d071ef59..abf9c398f 100644
--- a/htdocs/util/watchlist/settings-dist.inc.php
+++ b/htdocs/util/watchlist/settings-dist.inc.php
@@ -11,8 +11,8 @@
 	
 	$nologs = 'Keine neuen Logeinträge';
 	
-	$logowner_text = '{date} {user} hat einen Logeintrag für deinen Cache "{cachename}" gemacht.' . "\n" . 'http://www.opencaching.de/viewcache.php?cacheid={cacheid}' . "\n\n" . '{text}' . "\n\n\n\n";
-	$logwatch_text = '{date} {user} hat einen Logeintrag für den Cache "{cachename}" gemacht.' . "\n" . 'http://www.opencaching.de/viewcache.php?cacheid={cacheid}' . "\n\n" . '{text}' . "\n\n\n\n";
+	$logowner_text = '{date} {user} hat einen Logeintrag für deinen Cache "{cachename}" gemacht.' . "\n" . 'http://opencaching.de/{wp_oc}' . "\n\n" . '{text}' . "\n\n\n\n";
+	$logwatch_text = '{date} {user} hat einen Logeintrag für den Cache "{cachename}" gemacht.' . "\n" . 'http://opencaching.de/{wp_oc}' . "\n\n" . '{text}' . "\n\n\n\n";
 
 	$watchpid = $rootpath . 'cache/watch.pid';
 ?>