diff --git a/polymer/eduke32/source/funct.h b/polymer/eduke32/source/funct.h
index b39fc7a7c..9c6acf2f8 100644
--- a/polymer/eduke32/source/funct.h
+++ b/polymer/eduke32/source/funct.h
@@ -355,4 +355,6 @@ extern void updatenames(void);
 extern void sendboardname(void);
 extern void sendquit(void);
 
+extern void adduserquote(char *daquote);
+
 #endif // __funct_h__
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index ebac0f107..1b060293e 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -7933,7 +7933,8 @@ void checkcommandline(int argc,char **argv)
                     ud.m_respawn_monsters = ud.respawn_monsters = 1;
                     ud.m_respawn_items = ud.respawn_items = 1;
                     ud.m_respawn_inventory = ud.respawn_inventory = 1;
-
+                    for(j=numplayers;j<ud.multimode;j++)
+                        Bsprintf(ud.user_name[j],"PLAYER %d",j+1);
                     break;
                 case 'r':
                 case 'R':
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 2c56827d7..dadb3b057 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -3450,40 +3450,25 @@ void processinput(short snum)
                     ps[p->frag_ps].frag++;
                     frags[p->frag_ps][snum]++;
 
-                    if(ud.user_name[p->frag_ps][0])
+                    if(snum == screenpeek)
                     {
-                        if(snum == screenpeek)
-                        {
-                            Bsprintf(fta_quotes[115],"KILLED BY %s",&ud.user_name[p->frag_ps][0]);
-                            FTA(115,p);
-                        }
-                        else
-                        {
-                            Bsprintf(fta_quotes[116],"KILLED %s",&ud.user_name[snum][0]);
-                            FTA(116,&ps[p->frag_ps]);
-                        }
+                        Bsprintf(fta_quotes[115],"KILLED BY %s",&ud.user_name[p->frag_ps][0]);
+                        FTA(115,p);
                     }
                     else
                     {
-                        if(snum == screenpeek)
-                        {
-                            Bsprintf(fta_quotes[115],"KILLED BY PLAYER %d",p->frag_ps);
-                            FTA(115,p);
-                        }
-                        else
-                        {
-                            Bsprintf(fta_quotes[116],"KILLED PLAYER %d",snum);
-                            FTA(116,&ps[p->frag_ps]);
-                        }
+                        Bsprintf(fta_quotes[116],"KILLED %s",&ud.user_name[snum][0]);
+                        FTA(116,&ps[p->frag_ps]);
                     }
+                    Bsprintf(tempbuf,"%s WAS KILLED BY %s",&ud.user_name[snum][0],&ud.user_name[p->frag_ps][0]);
+                    adduserquote(tempbuf);
                 }
                 else p->fraggedself++;
 
                 if(myconnectindex == connecthead)
                 {
-                    unsigned char tmpbuf[2048];
-                    Bsprintf(tmpbuf,"frag %d killed %d\n",p->frag_ps+1,snum+1);
-                    sendscore(tmpbuf);
+                    Bsprintf(tempbuf,"frag %d killed %d\n",p->frag_ps+1,snum+1);
+                    sendscore(tempbuf);
                     //                    printf(tempbuf);
                 }