Fixed users and other mess