diff --git a/openedx/core/djangoapps/user_authn/views/registration_form.py b/openedx/core/djangoapps/user_authn/views/registration_form.py
index 88c3a7a8047..952ab5b5e1e 100644
--- a/openedx/core/djangoapps/user_authn/views/registration_form.py
+++ b/openedx/core/djangoapps/user_authn/views/registration_form.py
@@ -690,7 +690,10 @@ def _add_custom_field(self, form_desc, required=True, **kwargs):
         # Check to convert options:
         field_options = custom_field_dict.get("options")
         if field_options:
-            field_options = [(six.text_type(option.lower()), option) for option in field_options]
+            try:
+                field_options = [(six.text_type(value.lower()), name) for value, name in field_options.items()]
+            except AttributeError:
+                field_options = [(six.text_type(value.lower()), value) for value in field_options]
 
         # Set default option if applies:
         default_option = custom_field_dict.get("default")