Workshop invoice - use personal address

When you generate an invoice from a class/qualification there is an option to generate the invoice using the clients personal address. This option is not available when creating an invoice from the workshop so the address field in the invoice defaults to something related to the contacts organisation.

If we can add the personal address option when invoicing from a workshop that would be great.