diff --git a/app/views/decidim/extra_user_fields/_profile_form.html.erb b/app/views/decidim/extra_user_fields/_profile_form.html.erb
index fb33188..ca68184 100644
--- a/app/views/decidim/extra_user_fields/_profile_form.html.erb
+++ b/app/views/decidim/extra_user_fields/_profile_form.html.erb
@@ -7,7 +7,11 @@
 <% end %>
 
 <% if current_organization.activated_extra_field?(:country) %>
-  <%= f.custom_country_select :country %>
+  <%= f.label :country do %>
+    <%# TODO: include the required attribute properly %>
+    <%= t("activemodel.attributes.user.country") %>
+    <%= f.country_select :country %>
+  <% end %>
 <% end %>
 
 <% if current_organization.activated_extra_field?(:postal_code) %>
diff --git a/app/views/decidim/extra_user_fields/_registration_form.html.erb b/app/views/decidim/extra_user_fields/_registration_form.html.erb
index 8020125..e6eb234 100644
--- a/app/views/decidim/extra_user_fields/_registration_form.html.erb
+++ b/app/views/decidim/extra_user_fields/_registration_form.html.erb
@@ -11,7 +11,11 @@
     <% end %>
 
     <% if current_organization.activated_extra_field?(:country) %>
-      <%= f.custom_country_select :country %>
+      <%= f.label :country do %>
+        <%# TODO: include the required attribute properly %>
+        <%= t("activemodel.attributes.user.country") %>
+        <%= f.country_select :country %>
+      <% end %>
     <% end %>
 
     <% if current_organization.activated_extra_field?(:postal_code) %>