Refactor : move back UserClient struct in model

2 jobs for master in 3 minutes and 24 seconds (queued for 2 seconds)