fix tenant user manager issues