[Backport 5.2] [Backport 6.0] Be able to force the client information

[Backport 5.2] [Backport 6.0] Be able to force the client information #2047