New hire - have company code before SSN/SIN

When adding a new hire, if the client has US and Canadian companies, the field for SIN/SSN is prior to the company code. So a user would type in the ID, then select the company. When doing that, it wipes out the SSN/SIN that was entered and it has to be re-entered. Either flip/flop the fields, or don't wipe out the ID when the company is selected!