diff --git a/virtualenv/pffedportal/create_loginhtml.py b/virtualenv/pffedportal/create_loginhtml.py
index 75c2880..00ea5d3 100755
--- a/virtualenv/pffedportal/create_loginhtml.py
+++ b/virtualenv/pffedportal/create_loginhtml.py
@@ -66,8 +66,11 @@ n = 0
 idps = []
 for provider in LibertyProvider.objects.all():
     n += 1
-    geo = geo_idps.get(provider.entity_id, {}).get('geo',
-            {'lat': 47.0+2.0*math.sin(n), 'lon': 2.5+3.0*math.cos(n)})
+    geo = geo_idps.get(provider.entity_id, {}).get('geo')
+    if isinstance(geo, list) and geo:
+        geo = geo[0]
+    if not geo:
+        geo = {'lat': 47.0+2.0*math.sin(n), 'lon': 2.5+3.0*math.cos(n)}
     idps.append({
         'entityid': provider.entity_id,
         'name': get_ui_displayname(provider),