When a new user fills in the registration form for email-based self registration, the city and country fields are required.

Replication steps:

1. Navigate to Site admin > Plugins > Authentication > Manage authentication
2. Ensure "Email-based self-registration" is enabled (default)
3. Enable " Self registration" (registerauth)
4. Open a new browser for the student
5. Click the "Log in" link in top-right corner
6. Click "Create a new account"

Expected behaviour: The city and country fields should be optional.

Actual result: The city and country fields are required.