diff -r 9b07ddeb1412 -r 94834a1e6c01 app/soc/templates/soc/user/edit.html
--- a/app/soc/templates/soc/user/edit.html	Fri Nov 14 06:36:42 2008 +0000
+++ b/app/soc/templates/soc/user/edit.html	Sat Nov 15 03:12:33 2008 +0000
@@ -17,7 +17,7 @@
  {{ page.short_name }}
  {% if existing_user %}
 for {{ existing_user.nick_name }}
-<a href="mailto:{{ existing_user.id.email }} ">&lt;{{ existing_user.id.email }}&gt;</a>
+<a href="mailto:{{ existing_user.account.email }} ">&lt;{{ existing_user.account.email }}&gt;</a>
  {% endif %}
 {% endblock %}
 {% block body %}
@@ -31,9 +31,9 @@
   {{ form.key_name }}
  <table>
   {% if existing_user %}
-  {% readonly_field_as_table_row "Id" existing_user.id %}
+  {% readonly_field_as_table_row "Account" existing_user.account %}
   {% endif %}
-  {% field_as_table_row form.id %}
+  {% field_as_table_row form.account %}
 {% if lookup_error %}
 <tr>
  <td>&nbsp;</td>
@@ -45,12 +45,12 @@
   {% field_as_table_row form.link_name %}
   {% field_as_table_row form.nick_name %}
   {% field_as_table_row form.is_developer %}
-  {% if existing_user.former_ids %}
+  {% if existing_user.former_accounts %}
   <tr>
-   <td class="formfieldlabel">Former ids</td>
+   <td class="formfieldlabel">Former Accounts</td>
    <td>
-       {% for former_id in existing_user.former_ids %}
-       {{ former_id }}<br />
+       {% for former_account in existing_user.former_accounts %}
+       {{ former_account }}<br />
        {% endfor %}
    </td>
    <td class="formfieldrequired">&nbsp;</td>