diff --git a/src/org/yaaic/db/Database.java b/src/org/yaaic/db/Database.java
index 82a05e2..b7e91ae 100644
--- a/src/org/yaaic/db/Database.java
+++ b/src/org/yaaic/db/Database.java
@@ -315,6 +315,10 @@ public class Database extends SQLiteOpenHelper
 		Identity identity = this.getIdentityById(cursor.getInt(cursor.getColumnIndex(ServerConstants.IDENTITY)));
 		server.setIdentity(identity);
 		
+		// Load auto join channels
+		ArrayList<String> channels = this.getChannelsByServerId(server.getId());
+		server.setAutoJoinChannels(channels);
+		
 		return server;
 	}