Some fixes with the user manager