Fix stuff with users