diff --git a/views/html/achievements/index.tpl b/views/html/achievements/index.tpl
index 7b6fc469..051b1d1e 100644
--- a/views/html/achievements/index.tpl
+++ b/views/html/achievements/index.tpl
@@ -56,8 +56,8 @@
 		<?php if(!is_null($achievement['achieved_achievementsmedia_id'])) : ?>
 		<img src="<?=$linker->link(array('media','achievement',$seminary['url'],$achievement['url']))?>" />
 		<?php endif ?>
+		<h3 id="<?=$achievement['url']?>"><?=$achievement['title']?></h3>
 		<p class="fwb">
-			<?=$achievement['title']?>
 			<span class="unlcked"><?=sprintf(_('achieved at: %s'), $dateFormatter->format(new \DateTime($achievement['created'])))?></span>
 		</p>
 		<p class="desc"><?=\hhu\z\Utils::t($achievement['description'])?></p>
@@ -68,9 +68,7 @@
 		<?php if(!is_null($achievement['unachieved_achievementsmedia_id'])) : ?>
 		<img src="<?=$linker->link(array('media','achievement',$seminary['url'],$achievement['url']))?>" />
 		<?php endif ?>
-		<p class="fwb">
-			<?=(!$achievement['hidden']) ? $achievement['title'] : _('Secret Achievement')?>
-		</p>
+		<h3 id="<?=$achievement['url']?>"><?=(!$achievement['hidden']) ? $achievement['title'] : _('Secret Achievement')?></h3>
 		<?php if(!$achievement['hidden']) : ?>
 		<p class="desc"><?=\hhu\z\Utils::t($achievement['description'])?></p>
 		<?php else : ?>
diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl
index 0ea56007..925a9df0 100644
--- a/views/html/characters/character.tpl
+++ b/views/html/characters/character.tpl
@@ -33,9 +33,9 @@
 			<?php foreach($achievements as &$achievement) : ?>
 			<li>
 				<?php if(!is_null($achievement['achieved_achievementsmedia_id'])) : ?>
-				<a href="#" title="Achievement-Titel"><img src="<?=$linker->link(array('media','achievement',$seminary['url'],$achievement['url']))?>"></a>
+				<a href="<?=$linker->link(array('achievements','index',$seminary['url']),0,true,null,true,$achievement['url'])?>" title="Achievement-Titel"><img src="<?=$linker->link(array('media','achievement',$seminary['url'],$achievement['url']))?>"></a>
 				<?php endif ?>
-				<p><a href="#"><?=$achievement['title']?></a></p>
+				<p><a href="<?=$linker->link(array('achievements','index',$seminary['url']),0,true,null,true,$achievement['url'])?>"><?=$achievement['title']?></a></p>
 				<p><small><?=sprintf(_('achieved at: %s'), $dateFormatter->format(new \DateTime($achievement['created'])))?></small></p>
 			</li>
 			<?php endforeach ?>
diff --git a/views/html/seminarybar/index.tpl b/views/html/seminarybar/index.tpl
index c71cf164..c2b62e47 100644
--- a/views/html/seminarybar/index.tpl
+++ b/views/html/seminarybar/index.tpl
@@ -22,9 +22,9 @@
 	<ul class="cranks">
 		<li>
 			<?php if(!is_null($lastAchievement['achieved_achievementsmedia_id'])) : ?>
-			<a href="#" title="Achievement-Titel"><img src="<?=$linker->link(array('media','achievement',$seminary['url'],$lastAchievement['url']))?>"></a>
+			<a href="<?=$linker->link(array('achievements','index',$seminary['url']),0,true,null,true,$lastAchievement['url'])?>" title="Achievement-Titel"><img src="<?=$linker->link(array('media','achievement',$seminary['url'],$lastAchievement['url']))?>"></a>
 			<?php endif ?>
-			<p><a href="#"><?=$lastAchievement['title']?></a></p>
+			<p><a href="<?=$linker->link(array('achievements','index',$seminary['url']),0,true,null,true,$lastAchievement['url'])?>"><?=$lastAchievement['title']?></a></p>
 			<p><small><?=sprintf(_('achieved at: %s'), $dateFormatter->format(new \DateTime($lastAchievement['created'])))?></small></p>
 		</li>
 	</ul>