Reorder controller endpoints

The user controller has some catch-all endpoints that get in the way of
other endpoints.