--- a/app/soc/templates/soc/models/edit.html	Sun Feb 15 13:59:06 2009 +0000
+++ b/app/soc/templates/soc/models/edit.html	Sun Feb 15 13:59:36 2009 +0000
@@ -20,8 +20,7 @@
 {% block header_title %}
 {{ page_name }}
  {% if entity %}
-   <!-- TODO(srabbelier) use a generic entity name as link -->
-   <a href="/{{ entity_type_url|lower }}/show/{{ entity_suffix }}"
+   <a href="/{{ entity_type_url|lower }}/show/{{ entity.key.name }}"
 >{% if entity.name %}{{ entity.name }} {% endif %}(public view)</a>
  {% endif %}
 {% endblock %}