I also bought a used hw90 recently, and my safety was dodgy too. Whenever i tried to release the safety, the gun still wouldnt fire, no matter how much i pulled at the trigger. And the button used to re-engage the safety would cause the gun to fire if i pulled it.
Long story short, i spray gun oil in around the trigger mechanism and worked at the trigger and the safety, and it seems to be okay now.