diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc
index 79d17395..0582b553 100644
--- a/models/CharactersModel.inc
+++ b/models/CharactersModel.inc
@@ -165,7 +165,7 @@
 				break;
 				case 'role':
 					return $this->db->query(
-						'SELECT '.
+						'SELECT DISTINCT '.
 							'characters.id, characters.created, characters.user_id, characters.name, characters.url, cache_characters.xps, cache_characters.quest_xps, cache_characters.avatar_id, '.
 							'charactertypes.id AS charactertype_id, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url, '.
 							'xplevels.id AS xplevel_id, xplevels.level AS xplevel, '.
@@ -187,7 +187,7 @@
 				break;
 				default:
 					return $this->db->query(
-						'SELECT '.
+						'SELECT DISTINCT '.
 							'characters.id, characters.created, characters.user_id, characters.name, characters.url, cache_characters.xps, cache_characters.quest_xps, cache_characters.avatar_id, '.
 							'charactertypes.id AS charactertype_id, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url, '.
 							'xplevels.id AS xplevel_id, xplevels.level AS xplevel, '.
diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index 727adeb8..9440320c 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -13,10 +13,10 @@
 	<fieldset class="filter">
 		<p><small>Sortierung:</small></p>
 		<select name="sortorder" onchange="this.form.submit();">
-			<option value="charactername" <?php if($sortorder == 'charactername') : ?>selected="selected"<?php endif ?>><?=_('Character name')?></option>
+			<option value="name" <?php if($sortorder == 'charactername') : ?>selected="selected"<?php endif ?>><?=_('Character name')?></option>
 			<option value="xps" <?php if($sortorder == 'xps') : ?>selected="selected"<?php endif ?>><?=_('XPs')?></option>
 			<option value="role" <?php if($sortorder == 'role') : ?>selected="selected"<?php endif ?>><?=_('Role')?></option>
-			<option value="date" <?php if($sortorder == 'date') : ?>selected="selected"<?php endif ?>><?=_('Date of registration')?></option>
+			<option value="created" <?php if($sortorder == 'date') : ?>selected="selected"<?php endif ?>><?=_('Date of registration')?></option>
 			<?php foreach($characterfields as &$characterfield) : ?>
 			<option value="<?=$characterfield['url']?>" <?php if($sortorder == $characterfield['url']) : ?>selected="selected"<?php endif ?>><?=$characterfield['title']?></option>
 			<?php endforeach ?>