1 files changed, 35 insertions, 26 deletions

diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index f90996882..168e6dd90 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -27,35 +27,44 @@
 [% listselectionurlparams = INCLUDE listselectionurlparams %]
 
 [% columns =
-  [{name               => 'login_name'
-    heading            => 'Edit user...'
-    contentlink        => 'editusers.cgi?action=edit&userid=%%userid%%' _
-                          listselectionurlparams
-   }
-   {name               => 'realname'
-    heading            => 'Real name'
-   }
-   {name               => 'last_seen_date'
-    heading            => 'Last Login'
-   }
-   {heading            => 'Account History'
-    content            => 'View'
-    contentlink        => 'editusers.cgi?action=activity' _
-                                  '&userid=%%userid%%' _
-                                  listselectionurlparams
+  [{name        => 'login_name'
+    heading     => 'Edit user...'
+    contentlink => 'editusers.cgi?action=edit&userid=%%userid%%' _
+                   listselectionurlparams
+   },
+   {name        => 'email'
+    heading     => 'Email address'
+   },
+   {name        => 'realname'
+    heading     => 'Real name'
+   },
+   {name        => 'last_seen_date'
+    heading     => 'Last Login'
+   },
+   {name        => 'view_history_link',
+    heading     => 'Account History'
+    content     => 'View'
+    contentlink => 'editusers.cgi?action=activity' _
+                    '&userid=%%userid%%' _
+                    listselectionurlparams
+   },
+   {name        => 'action_link',
+    heading     => 'Action'
+    content     => 'Delete'
+    contentlink => 'editusers.cgi?action=del' _
+                      '&userid=%%userid%%' _
+                      listselectionurlparams
    }
   ]
-%]
+ %]
+
+[%# Eliminate inappropriate columns, starting at the end %]
+[% IF NOT (Param('allowuserdeletion') && editusers) %]
+  [% CALL columns.splice(5, 1) %]
+[% END %]
 
-[% IF Param('allowuserdeletion') && editusers %]
-  [% columns.push({heading     => 'Action'
-                   content     => 'Delete'
-                   contentlink => 'editusers.cgi?action=del' _
-                                  '&userid=%%userid%%' _
-                                  listselectionurlparams
-                  }
-                 )
-  %]
+[% IF Param('use_email_as_login') %]
+  [% CALL columns.splice(1, 1) %]
 [% END %]
 
 [%# Disabled users are crossed out. Missing realnames are noticed in red. %]