Changed some of the user stuff