diff --git a/rdp/rdp_lic.c b/rdp/rdp_lic.c
index bc4d7283..5efa776b 100644
--- a/rdp/rdp_lic.c
+++ b/rdp/rdp_lic.c
@@ -29,6 +29,7 @@ rdp_lic_create(struct rdp_sec* owner)
   struct rdp_lic* self;
 
   self = (struct rdp_lic*)g_malloc(sizeof(struct rdp_lic), 1);
+  self->sec_layer = owner;
   return self;
 }
 
@@ -126,8 +127,8 @@ rdp_lic_send_request(struct rdp_lic* self, char* client_random,
   struct stream* s;
 
   sec_flags = SEC_LICENCE_NEG;
-  userlen = g_strlen(self->sec_layer->rdp_layer->mod->username) + 1;
-  hostlen = g_strlen(self->sec_layer->rdp_layer->mod->hostname) + 1;
+  userlen = g_strlen(user) + 1;
+  hostlen = g_strlen(host) + 1;
   length = 128 + userlen + hostlen;
   make_stream(s);
   init_stream(s, 8192);
diff --git a/rdp/rdp_mcs.c b/rdp/rdp_mcs.c
index 5023abda..a7869c56 100644
--- a/rdp/rdp_mcs.c
+++ b/rdp/rdp_mcs.c
@@ -155,7 +155,7 @@ rdp_mcs_out_domain_params(struct rdp_mcs* self, struct stream* s,
                            int max_users, int max_tokens,
                            int max_pdu_size)
 {
-  rdp_mcs_ber_out_header(self, s, MCS_TAG_DOMAIN_PARAMS, 26);
+  rdp_mcs_ber_out_header(self, s, MCS_TAG_DOMAIN_PARAMS, 32);
   rdp_mcs_ber_out_int16(self, s, max_channels);
   rdp_mcs_ber_out_int16(self, s, max_users);
   rdp_mcs_ber_out_int16(self, s, max_tokens);