diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 62ac89c..fb396af 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -219,7 +219,8 @@ MmsBoxSettings *mms_load_mmsbox_settings(Cfg *cfg)
      } else 
 	  m->mms_detokenizefuncs = NULL;
 
-     cfg_get_bool(&m->allow_ip_type, grp, octstr_imm("allow-ip-type"));
+     if (cfg_get_bool(&m->allow_ip_type, grp, octstr_imm("allow-ip-type"))  < 0)
+	  m->allow_ip_type = 1;
      cfg_get_bool(&m->optimize_notification_size, grp, octstr_imm("optimize-notification-size"));
 
      if (mmbox_root_init(octstr_get_cstr(m->mmbox_rootdir)) != 0)
diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c
index c693f57..ca65104 100644
--- a/mbuni/mmsc/mmsproxy.c
+++ b/mbuni/mmsc/mmsproxy.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
 								settings->wap_gw_ip_header, 
 								h.ip, &ipv6);
 			h.client_addr  = octstr_format("%S/TYPE=IPv%s", 
-						       h.ip, ipv6 ? "6" : "4");
+						       h.base_client_addr, ipv6 ? "6" : "4");
 		    } else {
 		         h.client_addr = NULL;
 		    }