Merge: Benitlux: Minor improvements to the server

This is in preparation to the introduction of all the social network features.

I expect to have some .sav to update because of the commit removing the check of NIT_TESTING.

Pull-Request: #1981
Reviewed-by: Jean Privat <jean@pryen.org>