diff --git a/hrafn.py b/hrafn.py
index 874ce4a..f3e68e0 100755
--- a/hrafn.py
+++ b/hrafn.py
@@ -72,7 +72,7 @@ class Hrafn():
         if not self.db.has_key('active_user'):
             try:
                 self.db['active_user'] = self.accounts.keys()[0]
-            except KeyError:
+            except IndexError:
                 self.db['active_user'] = None
 
 
@@ -149,7 +149,8 @@ class Hrafn():
 
 
     def update_account_label(self):
-        self.account_label.set_text(self.username + ': ')
+        if self.username:
+            self.account_label.set_text(self.username + ': ')
 
 
     # Spawns a thread for each pane, which updates that pane.