diff --git a/message.go b/message.go
index fa5e577..ba12c37 100644
--- a/message.go
+++ b/message.go
@@ -1092,8 +1092,6 @@ func (server *Server) handleAclMessage(client *Client, msg *Message) {
 
 			server.ClearACLCache()
 		}
-
-		// fixme(mkrautz): Sync channel to datastore
 	}
 }
 
diff --git a/server.go b/server.go
index a8fc6ce..88056a4 100644
--- a/server.go
+++ b/server.go
@@ -622,9 +622,9 @@ func (server *Server) finishAuthenticate(client *Client) {
 	}
 
 	err := client.sendProtoMessage(MessageServerConfig, &mumbleproto.ServerConfig{
-		AllowHtml:          proto.Bool(true),
-		MessageLength:      proto.Uint32(1000),
-		ImageMessageLength: proto.Uint32(1000),
+		AllowHtml:          proto.Bool(server.cfg.BoolValue("AllowHTML")),
+		MessageLength:      proto.Uint32(server.cfg.Uint32Value("MaxTextMessageLength")),
+		ImageMessageLength: proto.Uint32(server.cfg.Uint32Value("MaxImageMessageLength")),
 	})
 	if err != nil {
 		client.Panicf("%v", err)