Broadvoice, Multiple Lines

With more then 1 BV line, when I add the sections in sip.conf for them, asterisk uses the last password it finds as opposed to the correct one, so I have

secret=some password


When a call comes in on 1021, asterisk tries to send an INVITE using the password for 1022, since they are all registered to

Is there any workaround for this yet?