More style thingies
Move user stuff to the user service and use indirection