3 files changed, 4 insertions, 4 deletions
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html
index c0db82f28..752a6f9db 100644
--- a/templates/web/default/admin/update_edit.html
+++ b/templates/web/default/admin/update_edit.html
@@ -22,8 +22,8 @@
 </select></li>
 <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% update.name | html %]'></li>
 <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'>
-[%- IF update.user.from_body && update.user.from_body == update.problem.bodies_str %]
-[% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_body ) _')' %]
+[%- IF update.user.from_body && update.user.from_body.id == update.problem.bodies_str %]
+[% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_body.id ) _')' %]
 [% END -%]
 [%- IF update.user.id == update.problem.user.id %]
 [% ' (' _ loc('user is problem owner') _')' %]
diff --git a/templates/web/default/admin/user_edit.html b/templates/web/default/admin/user_edit.html
index 205e6561e..f1fc83c05 100644
--- a/templates/web/default/admin/user_edit.html
+++ b/templates/web/default/admin/user_edit.html
@@ -12,7 +12,7 @@
 <li>[% loc('Council:') %] <select id='body' name='body'>
     <option value=''>[% loc('No council') %]</option>
 [% FOR body IN bodies %]
-    <option value="[% body.id %]"[% ' selected' IF body.id == user.from_body %]>[% body.name %]</option>
+    <option value="[% body.id %]"[% ' selected' IF body.id == user.from_body.id %]>[% body.name %]</option>
 [% END %]
 </select>
 <li>[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]></li>
diff --git a/templates/web/default/admin/users.html b/templates/web/default/admin/users.html
index 12f681741..b9839e9f7 100644
--- a/templates/web/default/admin/users.html
+++ b/templates/web/default/admin/users.html
@@ -19,7 +19,7 @@
     <tr>
         <td>[% PROCESS value_or_nbsp value=user.name %]</td> 
         <td><a href="[% c.uri_for( 'reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
-        <td>[% PROCESS value_or_nbsp value=user.from_body %]</td> 
+        <td>[% PROCESS value_or_nbsp value=user.from_body.id %]</td> 
         <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : '&nbsp;' %]</td>
         <td>[% IF user.id %]<a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a>[% END %]</td>
     </tr>