diff --git a/config/scripts.cfg b/config/scripts.cfg
index 00df9bf8..2eef8dfb 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -370,15 +370,12 @@ strins = [
 ]
 
 // cleanshot - Take a "clean" screenshot with no HUD items.
-cs_sets = "clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun spechudgun showstats"
-cs_newsets = "0 0 1 1 1 1 1 1 1 1 1 1 0 0 0"
+cs_sets = "clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun spechudgun showstats showtargetname"
+cs_newsets = "0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0"
 
-cleanshot = [
-  storesets $cs_sets tmp_old_sets
-  loop csl (listlen $cs_sets) [ (at $cs_sets $csl) (at $cs_newsets $csl) ]
-  sleep 10 [ screenshot ]
-  sleep 90 [ loop ros (listlen $cs_sets) [ (at $cs_sets $ros) (at $tmp_old_sets $ros) ] ]
-]
+disablehud = [ storesets $cs_sets tmp_old_sets; loop csl (listlen $cs_sets) [ (at $cs_sets $csl) (at $cs_newsets $csl) ] ]
+enablehud = [ if (checkalias tmp_old_sets) [ loop ros (listlen $cs_sets) [ (at $cs_sets $ros) (at $tmp_old_sets $ros) ] ] ]
+cleanshot = [ disablehud; sleep 10 [ screenshot ]; sleep 90 [ enablehud ] ]
 
 votepending = 0
 if (! (checkalias onCallVote)) [ onCallVote = "" ]; if (! (strstr $onCallVote votepending)) [ add2alias onCallVote [ votepending = 1 ] ]