diff --git a/virtualenv/pffedportal/base/views.py b/virtualenv/pffedportal/base/views.py
index 8b1efc9..1aabebe 100644
--- a/virtualenv/pffedportal/base/views.py
+++ b/virtualenv/pffedportal/base/views.py
@@ -94,7 +94,10 @@ def login(request):
         prefered_idp = request.COOKIES.get('prefered_idp', settings.DEFAULT_IDP)
         default_idp = saml_models.LibertyProvider.objects.get(entity_id=prefered_idp)
     except:
-        default_idp = None
+        try:
+            default_idp = saml_models.LibertyProvider.objects.get(entity_id=settings.DEFAULT_IDP)
+        except:
+            default_idp = None
     register_next_target(request, url='/')
     if settings.EMAIL_RCPT and settings.EMAIL_HOST:
         mailform = True
diff --git a/virtualenv/pffedportal/templates/login0.html b/virtualenv/pffedportal/templates/login0.html
index 10bea3e..969f8c9 100644
--- a/virtualenv/pffedportal/templates/login0.html
+++ b/virtualenv/pffedportal/templates/login0.html
@@ -29,6 +29,7 @@
           </div>
 	  {% endif %}
 
+	  {% if default_idp %}
           <div class="well sidebar-nav" id="defaultidp">
             <ul class="nav nav-list">
 	      <li data-entityid="default_idp.entity_id">
@@ -37,6 +38,7 @@
 	      </li>
             </ul>
           </div>
+	  {% endif %}
 
           <p>
             <input class="span12" id="search" type="text" placeholder="Chercher dans la liste…">