diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index d1c028ca..9ac7905c 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -38,7 +38,7 @@ menuinitselection 13
 
 const __ingamemenu_showmodel [
   if (&& (< (player1 team) 4) $arg2) [
-    chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (player1 team)) "/0" (+ 1 (skin))) idle 15 3
+    chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (player1 team)) "/0" (+ 1 (player1 skin))) idle 15 3
   ] [
     chmenumdl $arg1
   ]
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index 7e068f7f..ccf3b0cf 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -75,7 +75,7 @@ loop gwm (listlen $DEFAULT_PRIMARIES) [
 
 newmenu CLA
 
-menuinit [ menuselection CLA (skin_cla) ]
+menuinit [ menuselection CLA (player1 skin_cla) ]
 menumdl playermodels/CLA/01 all 50 4
 menuitem [Comandante] [ skin_cla 0 ] [ chmenumdl CLA playermodels/CLA/01 all 50 4 ]
 menuitem [Psycho]     [ skin_cla 1 ] [ chmenumdl CLA playermodels/CLA/02 all 50 4 ]
@@ -84,7 +84,7 @@ menuitem [Ripper]     [ skin_cla 3 ] [ chmenumdl CLA playermodels/CLA/04 all 50
 
 newmenu RVSF
 
-menuinit [menuselection RVSF (skin_rvsf)]
+menuinit [menuselection RVSF (player1 skin_rvsf)]
 menumdl playermodels/RVSF/01 all 50 4
 menuitem [Alpha]  [ skin_rvsf 0 ] [ chmenumdl RVSF playermodels/RVSF/01 all 50 4 ]
 menuitem [Tango]  [ skin_rvsf 1 ] [ chmenumdl RVSF playermodels/RVSF/02 all 50 4 ]
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index f0df61a9..7eb1dbe1 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -302,6 +302,9 @@ void playerinfo(int *cn, const char *attr)
     ATTR_INT(alive, p->state == CS_ALIVE ? 1 : 0);
     ATTR_INT(spect, p->team == TEAM_SPECT || p->spectatemode == SM_FLY ? 1 : 0);
     ATTR_INT(cn, p->clientnum); // only useful to get player1's client number.
+    ATTR_INT(skin_cla, p->skin(TEAM_CLA));
+    ATTR_INT(skin_rvsf, p->skin(TEAM_RVSF));
+    ATTR_INT(skin, p->skin(player1->team));
 
     string addrstr = "";
     uint2ip(p->address, addr);