diff --git a/app/eve_api/models/character.py b/app/eve_api/models/character.py
index f25d788..ed38dd3 100644
--- a/app/eve_api/models/character.py
+++ b/app/eve_api/models/character.py
@@ -69,7 +69,7 @@ class EVEPlayerCharacter(EVEAPIModel):
             return None
 
     @property
-    def account(self)
+    def account(self):
         if self.eveaccount_set.count():
             return self.eveaccount_set.all()[0]
         return None
diff --git a/app/eve_api/templates/eve_api/character_list.html b/app/eve_api/templates/eve_api/character_list.html
index 8149c5a..857d63d 100644
--- a/app/eve_api/templates/eve_api/character_list.html
+++ b/app/eve_api/templates/eve_api/character_list.html
@@ -5,15 +5,21 @@
 <h1>Character List</h1>
 
 {% if characters %}
+
+{% regroup characters by account as acc_list %}
+
 <table>
 <tr><th>Character Name</th><th>Corporation</th><th>Alliance</th><th>Training</th></tr>
-{% for char in characters %}
+{% for acc in acc_list %}
+<tr><th colspan=4>Account {{ acc.grouper }}</th></tr>
+{% for char in acc.list %}
 <tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td>
     <td><a href="{% url eveapi-corporation char.corporation.id %}">{{ char.corporation }}</a></td>
     <td>{% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %}</td>
     <td>{% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}</td> 
 </tr>
 {% endfor %}
+{% endfor %}
 </table>
 {% endif %}