Changes / #1808

Thanks for your comments / tests.

I will adjust the code as recommended.

And what do you think about a different colour (e.g. dark grey) for the "client", "supplier" etc. tabs to differentiate them from the "companies" tab?