--- a/app/soc/templates/soc/host/public.html	Thu Oct 23 11:42:22 2008 +0000
+++ b/app/soc/templates/soc/host/public.html	Thu Oct 23 12:00:29 2008 +0000
@@ -14,12 +14,8 @@
 {% endcomment %}
 {% load forms_helpers %}
 
-{% block page_title %}
-{{ entity.user.link_name }}
-{% endblock %}
-
 {% block header_title %}
-{{ entity.user.link_name }}
+{{ page.short_name }} for {{ entity.user.nick_name }} ({{ entity.given_name }} {{ entity.surname }})
 {% endblock %}
 
 {% block body %}
@@ -28,9 +24,6 @@
   {% readonly_field_as_table_row entity.fields.given_name.label entity.given_name %}
   {% readonly_field_as_table_row entity.fields.surname.label entity.surname %}
   {% readonly_field_as_table_row entity.fields.display_name.label entity.display_name %}
-  {% readonly_field_as_table_row entity.fields.surname.label entity.surname %}
-  {% readonly_field_as_table_row entity.fields.display_name.label entity.display_name %}
-  {% readonly_field_as_table_row entity.fields.email.label entity.email %}
   <!-- TODO(pawel.solyga) make this generic -->
  </table>
 </p>

--- a/app/soc/templates/soc/models/edit.html	Thu Oct 23 11:42:22 2008 +0000
+++ b/app/soc/templates/soc/models/edit.html	Thu Oct 23 12:00:29 2008 +0000
@@ -28,7 +28,7 @@
 <p>
 <p>
 {% block instructions %}
-Please use this form to edit the {{ entity_name }}
+Please use this form to edit the {{ entity_type }}.
 {% endblock %}
 </p>
 <form method="POST">