Add client_id
Correct User methods