Move user stuff to its own role