diff --git a/src/org/yaaic/model/Server.java b/src/org/yaaic/model/Server.java
index b02385a..6d7e421 100644
--- a/src/org/yaaic/model/Server.java
+++ b/src/org/yaaic/model/Server.java
@@ -43,6 +43,7 @@ public class Server
 	private Identity identity;
 	
 	private LinkedHashMap<String, Conversation> conversations = new LinkedHashMap<String, Conversation>();
+	private ArrayList<String> autoJoinChannels;
 	
 	private int status = Status.DISCONNECTED;
 	private String selected = "";
@@ -234,6 +235,26 @@ public class Server
 		return status;
 	}
 	
+	/**
+	 * Set list of channels to auto join after connect
+	 * 
+	 * @param channels List of channel names
+	 */
+	public void setAutoJoinChannels(ArrayList<String> autoJoinChannels)
+	{
+		this.autoJoinChannels = autoJoinChannels;
+	}
+	
+	/**
+	 * Get list of channels to auto join after connect
+	 * 
+	 * @return List of channel names
+	 */
+	public ArrayList<String> getAutoJoinChannels()
+	{
+		return autoJoinChannels;
+	}
+	
 	/**
 	 * Is disconnected?
 	 *