diff --git a/TrsrDB/HTTP/Account.pm b/TrsrDB/HTTP/Account.pm
index 8051589..8368751 100644
--- a/TrsrDB/HTTP/Account.pm
+++ b/TrsrDB/HTTP/Account.pm
@@ -43,18 +43,27 @@ sub upsert {
         
     if ( $self->req->method eq 'POST' ) {
         my $p = $self->req->params->to_hash;
+
         if ( ($p->{IBAN}//q{}) eq q{*} ) {
             $p->{IBAN} = q{};
         }
         elsif ( !$iban ) {
             delete $p->{IBAN};
         } 
+
+        if ( $p->{ID} !~ m{ \A [a-z] \w+ \z }aixms ) {
+            die "Invalid ID: Must consist of ascii letters/numbers/",
+                "underscores, but always begin with a letter";
+        }
+ 
         for my $field ($account->result_source->columns) {
             my $value = $p->{ $field };
             $account->$field($value);
         }
+
         $account->update_or_insert();    
         $self->redirect_to("home");
+
     }
     else {
         if ( defined( $iban ) ) {
diff --git a/templates/account/list.html.ep b/templates/account/list.html.ep
index 5cd646f..8b15d12 100644
--- a/templates/account/list.html.ep
+++ b/templates/account/list.html.ep
@@ -17,8 +17,8 @@
 <%= $inter_header->($t) %>
 % }
 % my $u = $account->ID;
-<tr><th><a href="/account/<%= $u %>" title="<%= $account->name %>"><%= $u %></a></th>
-   <td class="even_until"><%= $bal->even_until // "never" %></td><td class="number"><%== money $bal->arrears %></td><td><a href="<%= $u %>/debits"><img class="icon" alt="List" src="/list.svg" alt="List"></td><td><a title="Add a debit" href="<%= $u %>/out"><img class="icon" src="/add-debit.svg" alt="Charge"></a></td>
+<tr class="<%= $u %>"><th class="ID"><a href="/account/<%= $u %>" title="<%= $account->name %>"><%= $u %></a></th>
+   <td class="even_until"><%= $bal->even_until // "never" %></td><td class="arrears number"><%== money $bal->arrears %></td><td><a href="<%= $u %>/debits"><img class="icon" alt="List" src="/list.svg" alt="List"></td><td><a title="Add a debit" href="<%= $u %>/out"><img class="icon" src="/add-debit.svg" alt="Charge"></a></td>
 <td class="centered">
 % my $which = ($bal->arrears && 1) + ($bal->available && 1);
 % if ( $which == 2 ) {
@@ -32,7 +32,7 @@
 % else {
    <img class="icon" src="/even.svg" style="cursor:not-allowed;" alt="even">
 % }
-   </td><td class="number"><%== money $bal->available %></td><td><a href="<%= $u %>/credits"><img class="icon" alt="List" src="/list.svg" alt="List"></a></td><td><a title="Add a credit" href="<%= $u %>/in"><img class="icon" src="/add-credit.svg" alt="Credit"></a></td><td class="number"><%== money $bal->earned %></td><td class="number"><%== money $bal->promised %></td><td><a href="<%= $u %>/history">History</a></td><td><a href="<%= $u %>/report">Report</a></td></tr>
+   </td><td class="available number"><%== money $bal->available %></td><td><a href="<%= $u %>/credits"><img class="icon" alt="List" src="/list.svg" alt="List"></a></td><td><a title="Add a credit" href="<%= $u %>/in"><img class="icon" src="/add-credit.svg" alt="Credit"></a></td><td class="earned number"><%== money $bal->earned %></td><td class="promised number"><%== money $bal->promised %></td><td><a href="<%= $u %>/history">History</a></td><td><a href="<%= $u %>/report">Report</a></td></tr>
 % } # while
 </table>