Changed user2client in views and webapi