diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc
index 8ae01465..f6797dcb 100644
--- a/controllers/UsersController.inc
+++ b/controllers/UsersController.inc
@@ -566,8 +566,7 @@
 		/**
 		 * Send mail for new user registration.
 		 * 
-		 * @param	string	$username	Name of newly registered user
-		 * @param	string	$email		E‑mail address of newly registered user
+		 * @param	array	$user	Newly registered user
 		 */
 		private function sendRegistrationMail($user)
 		{
diff --git a/views/htmlmail/mail/characterregistration.tpl b/views/htmlmail/mail/characterregistration.tpl
index 723931de..b88079a6 100644
--- a/views/htmlmail/mail/characterregistration.tpl
+++ b/views/htmlmail/mail/characterregistration.tpl
@@ -1,2 +1,2 @@
 <?=sprintf(_('User “%s” has registered a new Character for the Seminary “%s”'), $user['username'], $seminary['title'])?>:
-<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array('characters',$seminary['url'],$user['url']),0,false,null,false,null,true)?>"><?=$character['name']?></a><?php else : ?><?=$character['name']?><?php endif ?>
+<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array('characters','character',$seminary['url'],$character['url']),0,true,null,false,null,true)?>"><?=$character['name']?></a><?php else : ?><?=$character['name']?><?php endif ?>
diff --git a/views/htmlmail/mail/charactersubmission.tpl b/views/htmlmail/mail/charactersubmission.tpl
index ebd247d2..3bb493a1 100644
--- a/views/htmlmail/mail/charactersubmission.tpl
+++ b/views/htmlmail/mail/charactersubmission.tpl
@@ -1,2 +1,2 @@
 <?=sprintf(_('Character “%s” has submitted a new submission for the Quest “%s” of the Seminary “%s”'), $character['name'], $quest['title'], $seminary['title'])?>:
-<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array('quests','submission',$seminary['url'],$questgroup['url'],$quest['url'],$character['url']),0,false,null,false,null,true)?>"><?=$questgroup['title']?>/<?=$quest['title']?>/<?=$character['name']?></a><?php else : ?><?=$questgroup['title']?>/<?=$quest['title']?>/<?=$character['name']?><?php endif ?>
+<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array('quests','submission',$seminary['url'],$questgroup['url'],$quest['url'],$character['url']),0,true,null,false,null,true)?>"><?=$seminary['title']?>/<?=$questgroup['title']?>/<?=$quest['title']?>/<?=$character['name']?></a><?php else : ?><?=$seminary['title']?>/<?=$questgroup['title']?>/<?=$quest['title']?>/<?=$character['name']?><?php endif ?>
diff --git a/views/htmlmail/mail/userregistration.tpl b/views/htmlmail/mail/userregistration.tpl
index e5b79d20..3911a0d8 100644
--- a/views/htmlmail/mail/userregistration.tpl
+++ b/views/htmlmail/mail/userregistration.tpl
@@ -1,2 +1,2 @@
 <?=_('A new user has been registered')?>:
-<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array('users',$user['url']),0,true,null,false,null,true)?>"><?=$user['username']?></a><?php else : ?><?=$user['username']?><?php endif ?>
+<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array('users','user',$user['url']),0,true,null,false,null,true)?>"><?=$user['username']?></a><?php else : ?><?=$user['username']?><?php endif ?>
diff --git a/views/textmail/mail/characterregistration.tpl b/views/textmail/mail/characterregistration.tpl
index 22047555..2161feb4 100644
--- a/views/textmail/mail/characterregistration.tpl
+++ b/views/textmail/mail/characterregistration.tpl
@@ -1,3 +1,3 @@
 <?=sprintf(_('User “%s” has registered a new Character for the Seminary “%s”'), $user['username'], $seminary['title'])?>: <?=$character['name']?>
 
-<?php if(!is_null($linker)) : ?><?=$linker->link(array('characters',$seminary['url'],$user['url']),0,false,null,false,null,true)?><?php endif ?>
+<?php if(!is_null($linker)) : ?><?=$linker->link(array('characters','character',$seminary['url'],$character['url']),0,true,null,false,null,true)?><?php endif ?>
diff --git a/views/textmail/mail/charactersubmission.tpl b/views/textmail/mail/charactersubmission.tpl
index d65692e9..0b7b6837 100644
--- a/views/textmail/mail/charactersubmission.tpl
+++ b/views/textmail/mail/charactersubmission.tpl
@@ -1,2 +1,2 @@
 <?=sprintf(_('Character “%s” has submitted a new submission for the Quest “%s” of the Seminary “%s”'), $character['name'], $quest['title'], $seminary['title'])?>.
-<?php if(!is_null($linker)) : ?><?=$linker->link(array('quests','submission',$seminary['url'],$questgroup['url'],$quest['url'],$character['url']),0,false,null,false,null,true)?><?php endif ?>
+<?php if(!is_null($linker)) : ?><?=$linker->link(array('quests','submission',$seminary['url'],$questgroup['url'],$quest['url'],$character['url']),0,true,null,false,null,true)?><?php endif ?>
diff --git a/views/textmail/mail/userregistration.tpl b/views/textmail/mail/userregistration.tpl
index 8d77ff03..63d34c79 100644
--- a/views/textmail/mail/userregistration.tpl
+++ b/views/textmail/mail/userregistration.tpl
@@ -1,3 +1,3 @@
 <?=_('A new user has been registered')?>: <?=$user['username']?>
 
-<?php if(!is_null($linker)) : ?><?=$linker->link(array('users',$user['url']),0,false,null,false,null,true)?><?php endif ?>
+<?php if(!is_null($linker)) : ?><?=$linker->link(array('users','user',$user['url']),0,true,null,false,null,true)?><?php endif ?>