Improved sanitizing of the client ID - based on the name