Having seen a spate of issues on country of residence I suggest the application form is modified slightly:
By default your country of residence should be the country in the address you register on your application.
The form could then prompt with a message
“The country of the address you have registered will be used as your country of residence. You are only allowed to use your pass in this country on any 2 travel days during your pass validity. after activating. to aid outbound and inbound journeys.”
Optional - (You may need to provide further evidence of residency during travel if your Passport/ID is from a different country. This can be any document with your name and address in your country of residence from a bank or government agency.)
Do you agree to this Y/N .
If No we will use the country of issue of your passport.”
That would solve many issues we constantly read about including removing many of the issues people have with the confusion between country of citizenship and country of residence, and the issue of Inbound/outbound days.