diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 32b96263..caaca425 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -86,6 +86,7 @@ void newname(const char *name)
         c2sinit = false;
         filtertext(player1->name, name, 0, MAXNAMELEN);
         if(!player1->name[0]) s_strcpy(player1->name, "unarmed");
+        updateclientname(player1);
     }
     else conoutf("your name is: %s", player1->name);
     alias("curname", player1->name);
diff --git a/source/src/rendermodel.cpp b/source/src/rendermodel.cpp
index dd423e51..d18cc494 100644
--- a/source/src/rendermodel.cpp
+++ b/source/src/rendermodel.cpp
@@ -666,7 +666,7 @@ const char *getclientskin(const char *name, const char *suf)
         int sl = (int)strlen(s) - suflen;
         if(sl > 0 && !strcmp(s + sl, suf))
         {
-            if(!strncmp(name, s, namelen)) return s; // exact match
+            if(namelen == sl && !strncmp(name, s, namelen)) return s; // exact match
             if(s[sl - 1] == '_')
             {
                 s_strcpy(tmp, s);