diff --git a/www-ssl/inc/avatar/avatar504.gif b/www-ssl/inc/avatar/avatar251.gif
similarity index 100%
rename from www-ssl/inc/avatar/avatar504.gif
rename to www-ssl/inc/avatar/avatar251.gif
diff --git a/www-ssl/inc/avatar/avatar503.gif b/www-ssl/inc/avatar/avatar357.gif
similarity index 100%
rename from www-ssl/inc/avatar/avatar503.gif
rename to www-ssl/inc/avatar/avatar357.gif
diff --git a/www-ssl/inc/avatar/avatar501.gif b/www-ssl/inc/avatar/avatar392.gif
similarity index 100%
rename from www-ssl/inc/avatar/avatar501.gif
rename to www-ssl/inc/avatar/avatar392.gif
diff --git a/www-ssl/inc/avatar/avatar500.gif b/www-ssl/inc/avatar/avatar435.gif
similarity index 100%
rename from www-ssl/inc/avatar/avatar500.gif
rename to www-ssl/inc/avatar/avatar435.gif
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 973d1d7f..7980137e 100755
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -113,21 +113,11 @@ if (!IsSet($_POST["action"]))
 		</tr>
 		<tr>
 			<td>
-<?PHP
-// Anzahl der installierten Avatars
-$ANZ_AVATAR= shell_exec("ls inc/avatar/ | wc -l");
-	    ?> 
-	    
 	    <select name="eAvatar" onChange="document.avatar.src = './inc/avatar/avatar' + this.value  + '.gif'"
 	    			   onKeyup= "document.avatar.src = './inc/avatar/avatar' + this.value  + '.gif'"> 
 	    <?php
-	    for ($i=1; $i <= $ANZ_AVATAR; $i++ )
-	    {
-	    	echo "\t\t\t\t<option value=\"$i\"";
-		if ($_SESSION['Avatar'] == $i) { echo " selected"; }
-	    	echo ">avatar$i</option>\n";
-	    }
-	    echo "\n";
+	    for ($i=1; file_exists("./inc/avatar/avatar$i.gif"); $i++ )
+	    	echo "\t\t\t\t<option value=\"$i\"". ($_SESSION['Avatar'] == $i ? " selected":""). ">avatar$i</option>\n";
 	    ?>
 	    </select>&nbsp;&nbsp;
 	    <img src="./inc/avatar/avatar<?php echo $_SESSION['Avatar']; ?>.gif" name="avatar" border="0" alt="" align="top">