diff --git a/cis/private/profile/index.php b/cis/private/profile/index.php
index 26312d5be..673aa2a1e 100644
--- a/cis/private/profile/index.php
+++ b/cis/private/profile/index.php
@@ -256,7 +256,9 @@ echo '
 		'.$p->t('global/anrede').': '.$user->anrede.'<br>
 		'.$p->t('global/titel').': '.$user->titelpre.' <br>';
 
-if (!$ansicht)
+if ($user->wahlname)
+	echo $p->t('global/vorname').': '.$user->wahlname.'  <br>';
+else if (!$ansicht)
 	echo $p->t('global/vorname').': '.$user->vorname.'  '.$user->vornamen.'<br>';
 else
 	echo $p->t('global/vorname').': '.$user->vorname.'  <br>';
diff --git a/cis/private/tools/suche.php b/cis/private/tools/suche.php
index 09d63b12a..36f7fecb8 100644
--- a/cis/private/tools/suche.php
+++ b/cis/private/tools/suche.php
@@ -180,7 +180,7 @@ function searchPerson($searchItems)
 			echo '<td>',$row->anrede,'</td>';
 
 			if ($row->wahlname)
-				echo '<td>',$row->wahlname, ' ' ,$row->vorname, '</td>';
+				echo '<td>',$row->wahlname,'</td>';
 			else
 					echo '<td>',$row->vorname, '</td>';