diff --git a/src/org/yaaic/activity/AddServerActivity.java b/src/org/yaaic/activity/AddServerActivity.java
index aa7b728..96c5153 100644
--- a/src/org/yaaic/activity/AddServerActivity.java
+++ b/src/org/yaaic/activity/AddServerActivity.java
@@ -197,6 +197,7 @@ public class AddServerActivity extends Activity implements OnClickListener
 		
 		server.setId((int) serverId);
 		server.setIdentity(identity);
+		server.setAutoJoinChannels(channels);
 		
 		Yaaic.getInstance().addServer(server);
 	}
@@ -238,6 +239,7 @@ public class AddServerActivity extends Activity implements OnClickListener
 		
 		server.setId(this.server.getId());
 		server.setIdentity(identity);
+		server.setAutoJoinChannels(channels);
 		
 		Yaaic.getInstance().updateServer(server);
 	}