Switch to owner change instead of shh user change (#3763)

Switch to owner change instead of shh user change (#3763) #1631