diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py
index d60f38a..d4f7e09 100644
--- a/src/jcl/jabber/component.py
+++ b/src/jcl/jabber/component.py
@@ -817,7 +817,7 @@ class AccountManager(object):
         # "user_jid" column with Account subclasses
         for _account in \
                 Account.select(clauseTables=["account"],
-                               orderBy="user_jid"):
+                               orderBy=["user_jid", "name"]):
             if current_user_jid != _account.user_jid:
                 current_user_jid = _account.user_jid
                 result.extend(self.send_presence(self.component.jid,
diff --git a/src/jcl/jabber/feeder.py b/src/jcl/jabber/feeder.py
index 8c92311..f035d14 100644
--- a/src/jcl/jabber/feeder.py
+++ b/src/jcl/jabber/feeder.py
@@ -139,7 +139,7 @@ class FeederHandler(Handler):
         return all accounts.
         """
         accounts = Account.select(clauseTables=["account"],
-                                  orderBy="user_jid")
+                                  orderBy=["user_jid", "name"])
         return accounts
 
     def handle(self, stanza, lang_class, data):
diff --git a/src/jcl/jabber/tests/feeder.py b/src/jcl/jabber/tests/feeder.py
index 4661e5d..bffdfef 100644
--- a/src/jcl/jabber/tests/feeder.py
+++ b/src/jcl/jabber/tests/feeder.py
@@ -113,22 +113,22 @@ class FeederComponent_TestCase(JCLComponent_TestCase):
         class AccountFeeder(Feeder):
             def feed(self, _account):
                 return [("Simple Message for account " + _account.name,
-                            "user_jid: " + _account.user_jid), \
-                            ("Simple Message for account " + _account.name, \
-                            "jid: " + _account.jid)]
+                         "user_jid: " + _account.user_jid),
+                        ("Simple Message for account " + _account.name,
+                         "jid: " + _account.jid)]
 
         self.comp.stream = MockStream()
         self.comp.stream_class = MockStream
         model.db_connect()
-        account11 = Account(user_jid = "user1@test.com", \
-                            name = "account11", \
-                            jid = "account11@jcl.test.com")
-        account12 = Account(user_jid = "user1@test.com", \
-                            name = "account12", \
-                            jid = "account12@jcl.test.com")
-        account2 = Account(user_jid = "user2@test.com", \
-                           name = "account2", \
-                           jid = "account2@jcl.test.com")
+        account11 = Account(user_jid="user1@test.com",
+                            name="account11",
+                            jid="account11@jcl.test.com")
+        account12 = Account(user_jid="user1@test.com",
+                            name="account12",
+                            jid="account12@jcl.test.com")
+        account2 = Account(user_jid="user2@test.com",
+                           name="account2",
+                           jid="account2@jcl.test.com")
         self.comp.handler.feeder = AccountFeeder(self.comp)
         self.comp.handler.sender = MessageSender(self.comp)
         self.comp.handle_tick()
@@ -137,42 +137,42 @@ class FeederComponent_TestCase(JCLComponent_TestCase):
         self.assertEquals(len(messages_sent), 6)
         self.assertEqual(messages_sent[0].get_from(), "account11@jcl.test.com")
         self.assertEqual(messages_sent[0].get_to(), "user1@test.com")
-        self.assertEqual(messages_sent[0].get_subject(), \
-            "Simple Message for account account11")
-        self.assertEqual(messages_sent[0].get_body(), \
-            "user_jid: user1@test.com")
+        self.assertEqual(messages_sent[0].get_subject(),
+                         "Simple Message for account account11")
+        self.assertEqual(messages_sent[0].get_body(),
+                         "user_jid: user1@test.com")
         self.assertEqual(messages_sent[1].get_from(), "account11@jcl.test.com")
         self.assertEqual(messages_sent[1].get_to(), "user1@test.com")
-        self.assertEqual(messages_sent[1].get_subject(), \
-            "Simple Message for account account11")
-        self.assertEqual(messages_sent[1].get_body(), \
-            "jid: account11@jcl.test.com")
+        self.assertEqual(messages_sent[1].get_subject(),
+                         "Simple Message for account account11")
+        self.assertEqual(messages_sent[1].get_body(),
+                         "jid: account11@jcl.test.com")
 
         self.assertEqual(messages_sent[2].get_from(), "account12@jcl.test.com")
         self.assertEqual(messages_sent[2].get_to(), "user1@test.com")
-        self.assertEqual(messages_sent[2].get_subject(), \
-            "Simple Message for account account12")
-        self.assertEqual(messages_sent[2].get_body(), \
-            "user_jid: user1@test.com")
+        self.assertEqual(messages_sent[2].get_subject(),
+                         "Simple Message for account account12")
+        self.assertEqual(messages_sent[2].get_body(),
+                         "user_jid: user1@test.com")
         self.assertEqual(messages_sent[3].get_from(), "account12@jcl.test.com")
         self.assertEqual(messages_sent[3].get_to(), "user1@test.com")
-        self.assertEqual(messages_sent[3].get_subject(), \
-            "Simple Message for account account12")
-        self.assertEqual(messages_sent[3].get_body(), \
-            "jid: account12@jcl.test.com")
+        self.assertEqual(messages_sent[3].get_subject(),
+                         "Simple Message for account account12")
+        self.assertEqual(messages_sent[3].get_body(),
+                         "jid: account12@jcl.test.com")
 
         self.assertEqual(messages_sent[4].get_from(), "account2@jcl.test.com")
         self.assertEqual(messages_sent[4].get_to(), "user2@test.com")
-        self.assertEqual(messages_sent[4].get_subject(), \
-            "Simple Message for account account2")
-        self.assertEqual(messages_sent[4].get_body(), \
-            "user_jid: user2@test.com")
+        self.assertEqual(messages_sent[4].get_subject(),
+                         "Simple Message for account account2")
+        self.assertEqual(messages_sent[4].get_body(),
+                         "user_jid: user2@test.com")
         self.assertEqual(messages_sent[5].get_from(), "account2@jcl.test.com")
         self.assertEqual(messages_sent[5].get_to(), "user2@test.com")
-        self.assertEqual(messages_sent[5].get_subject(), \
-            "Simple Message for account account2")
-        self.assertEqual(messages_sent[5].get_body(), \
-            "jid: account2@jcl.test.com")
+        self.assertEqual(messages_sent[5].get_subject(),
+                         "Simple Message for account account2")
+        self.assertEqual(messages_sent[5].get_body(),
+                         "jid: account2@jcl.test.com")
 
 class Feeder_TestCase(unittest.TestCase):
     def test_feed_exist(self):