diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp
index be50a03d..2bc1dd85 100644
--- a/source/src/scoreboard.cpp
+++ b/source/src/scoreboard.cpp
@@ -170,15 +170,15 @@ void renderscore(playerent *d)
     {
         case 1:
         {
-            if(m_flags) formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->flagscore, d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, ign);
-            else formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, ign);
+            if(m_flags) formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->flagscore, d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, ign);
+            else formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, ign);
             break;
         }
         case 0:
         default:
         {
-            if(m_flags) formatstring(s)("%s%d\t%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->flagscore, d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
-            else formatstring(s)("%s%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->frags, d->deaths, d.points > 0 ? d.points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
+            if(m_flags) formatstring(s)("%s%d\t%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->flagscore, d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
+            else formatstring(s)("%s%d\t%d\t%d\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->frags, d->deaths, d->points > 0 ? d->points : 0, lagping, cncolumncolor, d->clientnum, status, colorname(d), ign);
             break;
         }
     }
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 21e17af5..84fc376e 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -97,6 +97,7 @@ void shiftweapon(int s)
 }
 
 bool quicknade = false;
+VARP(quicknade_hold, 0, 0, 1);
 
 void quicknadethrow(bool on)
 {
@@ -106,7 +107,7 @@ void quicknadethrow(bool on)
         if(player1->weapons[GUN_GRENADE]->mag > 0)
         {
             if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]);
-			if(player1->weaponsel->type == GUN_GRENADE) attack(true);
+            if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold ) attack(true);
         }
     }
     else