diff --git a/admin/fill_teams.sh b/admin/fill_teams.sh
index 83f2c346..45855c62 100755
--- a/admin/fill_teams.sh
+++ b/admin/fill_teams.sh
@@ -63,11 +63,11 @@ new_team() {
 	    COLOR=$((($R*256 + $G) * 256 + $B))
 
 	    [ "${GEN_PASSWD}" -eq 1 ] && {
-		PASSWD=$(pwgen -B -y 12)
+		PASSWD=$(pwgen -r '\\' -B -y 12)
 		cat >> teams.pass <<EOF
 ${N}:${PASSWD}
 EOF
-		NP=$(echo $N | cut -d : -f 1 | tr '[:upper:]âéêè' '[:lower:]aeee')
+		NP=$(echo $N | cut -d : -f 1 | sed 's/[[:upper:]]/\l&/g;s/[âáàä]/a/g;s/[êéèë]/e/g')
 		SALT="$(openssl rand -base64 3)"
 		HASHED="{SSHA}$(echo -n $PASS$SALT | openssl dgst -binary -sha1 | sed 's#$#'"$SALT"'#' | base64)"
 		cat >> htpasswd <<EOF