diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index c94877a47..7c8efbbb2 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -4315,9 +4315,8 @@ SKIPJIBS:
                 if(fta_quotes[i] != NULL)
                 {
                     if (ud.user_name[j][0])
-                        Bsprintf(fta_quotes[i],"%s",ud.user_name[j]);
-                    else
-                        Bsprintf(fta_quotes[i],"%d",j);
+                        Bstrcpy(fta_quotes[i],ud.user_name[j]);
+                    else Bsprintf(fta_quotes[i],"%d",j);
                 } else OSD_Printf("%s %d null quote %d\n",__FILE__,__LINE__,i);
                 break;
             case CON_QSTRCAT:
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index f0704baee..d5184b691 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -755,6 +755,7 @@ void prelevel(char g)
     while(i >= 0)
     {
         nexti = nextspritestat[i];
+        ResetActorGameVars(i);
         LoadActor(i, -1, -1);
         if(sprite[i].lotag == -1 && (sprite[i].cstat&16) )
         {