diff --git a/Templates/Message/inbox.tpl b/Templates/Message/inbox.tpl
index eddcf797..5fc69be4 100644
--- a/Templates/Message/inbox.tpl
+++ b/Templates/Message/inbox.tpl
@@ -74,11 +74,14 @@
 			}
 			$date = $generator->procMtime($message->inbox1[$i-1]['time']);
 			if($message->inbox1[$i-1]['owner'] <= 1) {
-			echo "</td><td class=\"send\"><a><u>".$database->getUserField($message->inbox1[$i-1]['owner'],'username',0)."</u></a></td>
+			echo "</td><td class=\"send\"><a href=\"support.php\"><u>".$database->getUserField($message->inbox1[$i-1]['owner'],'username',0)."</u></a></td>
 		    <td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>";
 		    }
 		    else {
-		    echo "</td><td class=\"send\"><a href=\"spieler.php?uid=".$message->inbox1[$i-1]['owner']."\">".$database->getUserField($message->inbox1[$i-1]['owner'],'username',0)."</a></td>
+		    $linkSender = ($message->inbox1[$i-1]['owner'] != 2 && $message->inbox1[$i-1]['owner'] != 4);
+
+		    echo "</td><td class=\"send\">".($linkSender ? "<a href=\"spieler.php?uid=".$message->inbox1[$i-1]['owner']."\">" : '<b>').$database->getUserField($message->inbox1[$i-1]['owner'],'username',0).($linkSender ? '</a>' : '</b>')."</td>
+
 		    <td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>";
 		    }
 		    }
diff --git a/Templates/Message/read.tpl b/Templates/Message/read.tpl
index 6d287bbe..f23daedd 100644
--- a/Templates/Message/read.tpl
+++ b/Templates/Message/read.tpl
@@ -17,7 +17,19 @@ include("menu.tpl");
 <div id="read_content" class="msg_content">
 	<img src="img/x.gif" id="label" class="read" alt="" />
 	<div id="heading">
-		<div><?php echo $database->getUserField($message->reading['owner'],"username",0); ?></div>
+		<div><?php
+			$linkSender = ($message->reading['owner'] != 2 && $message->reading['owner'] != 4);
+			if ($linkSender) {
+				echo '<a href="'.rtrim(SERVER, '/')."/spieler.php?uid=".$message->reading['owner']."\">";
+			}
+			
+			echo $database->getUserField($message->reading['owner'],"username",0);
+			
+			if ($linkSender) {
+				echo '</a>';
+			}
+			?>
+		</div>
 		<div><?php echo $message->reading['topic']; ?></div>
 	</div>
 	<div id="time">
diff --git a/todo.txt b/todo.txt
index 095a1604..f650ab1f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,3 @@
-- link username to user in message sender
 - scale oasis regeneration with game progresses (now we have elephants and tigers everywhere)
 - add checkbox when sending units for a raid to include the attack in the raid list, if eligible
 - change "incoming attacker" title of the raid list icon when actually attacking a farm (it should be "Own attacking troops")