Add uid field to User (as in oauthd 1.1)
Better code