Supplier Profile Fields eg: Name, Account Number

Back in v2.0.something the Suppliers was an addon. And the Profile Fields could be defined.

Supplier Users had a Firstname and Lastname and I believe one could add extra fields like (the ever useful) Account Number. This was very important for one of the warehouses I use.

Since v2.1.x Suppliers has been integrated and is no longer an addon.

Thus my invoice templates were all broken.

The big problem is that the Supplier Notification Email cant show our (supplier specific) Account Number to my Suppliers.

Again I am surprised at something so fundamental to drop-shipping is missing from the basic cart functionality.

Anyone know of a quick fix to get these fields back, or add some custom fields that can be shown in the Supplier emails:

EG, Account Name, Firstname Lastname, Payment Instructions, …

Help appreciated,