identifying cat6 cables in the hubs

We have a building of about 25 pcs and 3 dumb terminal users. On the wall next to everyone’s desks is a RJ45 socket with a number on it e.g. A17 and in our computer room we have 2 hubs labelled Upper and Lower, each has about 40 ports on them.

I have a cable tester which I could plug into the cat6 cable next to the users computer desk and locate the cable plugged into the hub and detect which is the correct end to the length of cable but unplugging 25 cables for every user is a pain in the neck.

Is there a simpler way either by another piece of hardware or software that could do it? And if so what is it and where can i get it?

And yes we should have noted all connections when the hubs were first installed but we didn’t.

Thanks
bruce