Company and vat number required only creating new account (not in fast guest checkout)

[Danijelp]

I'm using guest checkout for people which dont have company and I don't need company and vat number fields there, so I delete these 2 fields in order-opc-new-account.php file.

Also I change target link of button Create an account on this quick order page from id="opc_createAccount" to id="createAccount".

 

So, my wholesale customers must create account in regular way and they must fill company and vat number fields.

 

Is there possibility to make these 2 fields required only when creating "regular" new account??

 

I played a little bit with address.php class and authentification.tpl but with no success,

 

Thanks in advance