If you already have the client name, why would the form number be important?  When I check a return named ACME Inc, I know what kind of return I'm dealing with just like if I check a return for Wile E Coyote.