diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 4040133..adb6b24 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -159,11 +159,11 @@ if($currenttag!= '') {
 		$update = ' <small>('. T_('update') .' '. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>';
 
 		// User attribution
-		$copy = '';
-		if ($user == '' || isset($watched)) {
-			$copy = ' '. T_('by') .' <a href="'. createURL('bookmarks', $row['username']) .'">'. $row['username'] .'</a>';			
+		$copy = ' '. T_('by'). ' ';
+		if($userservice->isLoggedOn() && $currentUser->getUsername() ==  $row['username']) {
+			$copy.= T_('you');			
 		} else {
-			$copy = ' '. T_('by') . ' ' . T_('you'); 
+			$copy.= '<a href="'. createURL('bookmarks', $row['username']) .'">'. $row['username'] .'</a>';
 		}
 
 		// Udders!