Fix related to super users