Asked my manager,
As long as the manufacturers sent the same gun (serial number) back and you personally pick up the gun, you should NOT have to complete a second form.
The gunsmithing rules do not apply.
Ken, thanks for that! I wondered if it was a serial number issue.