The fire and water safety expert is back in the market's good books