MOB-2139 user killswitch fix