Manage some small corner cases when enabling users and computers module