diff --git a/geonode/people/templatetags/socialaccount_extra.py b/geonode/people/templatetags/socialaccount_extra.py
index 42c8e99981b..3daffb8fa4d 100644
--- a/geonode/people/templatetags/socialaccount_extra.py
+++ b/geonode/people/templatetags/socialaccount_extra.py
@@ -15,10 +15,10 @@ def get_user_social_providers(user):
 @register.simple_tag
 def get_other_social_providers(user):
     user_providers = get_user_social_providers(user)
-    user_provider_names = [p.name.lower() for p in user_providers]
+    user_provider_names = [p.id.lower() for p in user_providers]
     other_providers = []
-    for provider in providers.registry.get_list():
-        if provider.name.lower() not in user_provider_names:
+    for provider in providers.registry.get_class_list():
+        if provider.id.lower() not in user_provider_names:
             other_providers.append(provider)
     return other_providers
 
diff --git a/geonode/templates/socialaccount/snippets/provider_list.html b/geonode/templates/socialaccount/snippets/provider_list.html
index 89df15609fc..1d3cf1d09fa 100644
--- a/geonode/templates/socialaccount/snippets/provider_list.html
+++ b/geonode/templates/socialaccount/snippets/provider_list.html
@@ -5,15 +5,15 @@
 {% get_providers as socialaccount_providers %}
 
 {% for provider in socialaccount_providers %}
-        {% if provider.id == "openid" %}
+        {% if provider.id == "openid_connect" %}
             {% for brand in provider.get_brands %}
-                <a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
+                <a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider openid=brand.openid_url process=process %}">
                     {{brand.name}}
                 </a>
             {% endfor %}
         {% endif %}
         <div class="form-group">
-            <a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
+            <a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
                 <i class="fa fa-{{ provider.name|lower }}-square fa-2x" aria-hidden="true"></i>
                 {% if process == "login" %}
                     {% trans "Sign in with" %}
diff --git a/geonode/templates/socialaccount/snippets/remaining_providers_list.html b/geonode/templates/socialaccount/snippets/remaining_providers_list.html
index c6e355ba139..88dedab56a5 100644
--- a/geonode/templates/socialaccount/snippets/remaining_providers_list.html
+++ b/geonode/templates/socialaccount/snippets/remaining_providers_list.html
@@ -5,15 +5,15 @@
 {% get_other_social_providers user as other_providers %}
 
 {% for provider in other_providers %}
-    {% if provider.id == "openid" %}
+    {% if provider.id == "openid_connect" %}
         {% for brand in provider.get_brands %}
-            <a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
+            <a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider openid=brand.openid_url process=process %}">
                 {{brand.name}}
             </a>
         {% endfor %}
     {% endif %}
     <div class="form-group">
-        <a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
+        <a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
             <i class="fa fa-{{ provider.name|lower }}-square fa-2x" aria-hidden="true"></i>
             {% if process == "login" %}
                 {% trans "Sign in with" %}