diff --git a/app/views/orgas/show.html.haml b/app/views/orgas/show.html.haml
index 43a40985..e1c3efc6 100644
--- a/app/views/orgas/show.html.haml
+++ b/app/views/orgas/show.html.haml
@@ -20,27 +20,27 @@
           %em.fa.fa-li.fa-arrow-left
           = Orga.model_name.human.pluralize
       %li
-        = link_to events_path tag: @orga.name do
+        = link_to events_path tag: @orga.name_as_tag do
           %em.fa.fa-li.fa-calendar
           Agenda
 
       %li
-        = link_to events_path format: :rss, tag: @orga.name do
+        = link_to events_path format: :rss, tag: @orga.name_as_tag  do
           %em.fa.fa-li.fa-rss
           RSS
 
       %li
-        = link_to events_path format: :ics, tag: @orga.name do
+        = link_to events_path format: :ics, tag: @orga.name_as_tag  do
           %em.fa.fa-li.fa-th-list
           iCal
 
       %li
-        = link_to maps_path tag: @orga.name do
+        = link_to maps_path tag: @orga.name_as_tag  do
           %em.fa.fa-li.fa-map-marker
           OpenStreetMap
 
       %li
-        = link_to maps_path format: :json, tag: @orga.name do
+        = link_to maps_path format: :json, tag: @orga.name_as_tag  do
           %em.fa.fa-li.fa-dot-circle-o
           GeoJSON