Fixed up Users/status tool after refactor