diff --git a/source/src/clientextras.cpp b/source/src/clientextras.cpp
index 370c80ce..9d8f1195 100644
--- a/source/src/clientextras.cpp
+++ b/source/src/clientextras.cpp
@@ -90,8 +90,8 @@ void renderscore(playerent *d, int cn)
 {
     s_sprintfd(lag)("%d", d->plag);
     s_sprintfd(name) ("(%s)", d->name);
-	if(m_ctf) s_sprintf(scorelines.add().s)("%s%d\t%d\t%s\t%d\t%s\t%s (%d)", d->ismaster ? "\f0" : "", d->flagscore, d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, d->team, d->state==CS_DEAD ? name : d->name, cn);
-	else s_sprintf(scorelines.add().s)("%s%d\t%s\t%d\t%s\t%s (%d)", d->ismaster ? "\f0" : "", d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, m_teammode ? d->team : "", d->state==CS_DEAD ? name : d->name, cn);
+	if(m_ctf) s_sprintf(scorelines.add().s)("%d\t%d\t%s\t%d\t%s\t%s%s (%d)", d->flagscore, d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, d->team, d->ismaster ? "\f0" : "", d->state==CS_DEAD ? name : d->name, cn);
+	else s_sprintf(scorelines.add().s)("%d\t%s\t%d\t%s\t%s%s (%d)", d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, m_teammode ? d->team : "", d->ismaster ? "\f0" : "", d->state==CS_DEAD ? name : d->name, cn);
     menumanual(menu, scorelines.length()-1, scorelines.last().s);
 };
 
@@ -144,7 +144,6 @@ void renderscores()
         teamscores.sort(teamscorecmp);
         loopv(teamscores)
         {
-            //if(i>=4) break;
 			string &teamline = scorelines.add().s;
 			teamline[0] = 0;
             string s;
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index a4149844..464de7a8 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -462,10 +462,17 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
 
 		case SV_MASTERINFO:
 		{
-			playerent *pl;
 			int m = getint(p);
 			if(m == -1) loopv(players) { players[i]->ismaster = false; }
-			else if((pl = getclient(m)) != NULL) pl->ismaster = true;
+			else 
+			{	
+				playerent *pl = (m == getclientnum() ? player1 : getclient(m));
+				if(pl)
+				{
+					pl->ismaster = true;
+					conoutf("%s claimed master status", pl->name);
+				};
+			}
 			break;
 		};