diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
index d3828fe0e3..4e8aefe17c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
@@ -532,9 +532,9 @@ move_along:
 	/**************************************************************************/
 	default:
 		if (g_ftdm_sngss7_data.cfg.isupCkt[circuit].type != VOICE) {
-			SS7_ERROR("Rx %s on circuit that is not a voice CIC (%d)\n", 
+			ftdm_log(FTDM_LOG_DEBUG, "Rx %s on circuit that is not a voice CIC (%d) (circuit:%d)\n",
 						DECODE_LCC_EVENT(evntType),
-						g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic);
+						g_ftdm_sngss7_data.cfg.isupCkt[circuit].cic, circuit);
 			SS7_FUNC_TRACE_EXIT(__FUNCTION__);
 			return;
 		}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index f88202b1a8..11ff2318bb 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -60,6 +60,10 @@
 
 #define MAX_SIZEOF_SUBADDR_IE	24	/* as per Q931 4.5.9 */
 
+#define SNGSS7_SWITCHTYPE_ANSI(switchtype)	(switchtype == LSI_SW_ANS88) || \
+											(switchtype == LSI_SW_ANS92) || \
+											(switchtype == LSI_SW_ANS95)
+
 typedef struct ftdm2trillium
 {
 	uint8_t ftdm_val;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 91b8900fef..47249c2f5a 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -92,8 +92,10 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		/* Transmission medium requirements */
 		copy_txMedReq_to_sngss7(ftdmchan, &iam.txMedReq);
 
-		/* User Service Info A */
-		copy_usrServInfoA_to_sngss7(ftdmchan, &iam.usrServInfoA);
+		if (SNGSS7_SWITCHTYPE_ANSI(g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].switchType)) {
+			/* User Service Info A */
+			copy_usrServInfoA_to_sngss7(ftdmchan, &iam.usrServInfoA);
+		}
 		
 		/* Called Number information */
 		copy_cdPtyNum_to_sngss7(ftdmchan, &iam.cdPtyNum);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
index e61153c8e7..8631421fe6 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
@@ -641,39 +641,32 @@ ftdm_status_t copy_txMedReq_to_sngss7(ftdm_channel_t *ftdmchan, SiTxMedReq *txMe
 
 ftdm_status_t copy_usrServInfoA_to_sngss7(ftdm_channel_t *ftdmchan, SiUsrServInfo *usrServInfoA)
 {
-	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
-	
-	if ((g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].switchType == LSI_SW_ANS88) ||
-		(g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].switchType == LSI_SW_ANS92) ||
-		(g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].switchType == LSI_SW_ANS95)) {
+	usrServInfoA->eh.pres			= PRSNT_NODEF;
 
-		usrServInfoA->eh.pres			= PRSNT_NODEF;
+	usrServInfoA->infoTranCap.pres	= PRSNT_NODEF;
 
-		usrServInfoA->infoTranCap.pres	= PRSNT_NODEF;
-		
-		usrServInfoA->infoTranCap.val = get_trillium_val(bc_cap_codes, ftdmchan->caller_data.bearer_capability, ITC_SPEECH);
+	usrServInfoA->infoTranCap.val = get_trillium_val(bc_cap_codes, ftdmchan->caller_data.bearer_capability, ITC_SPEECH);
 
-		usrServInfoA->cdeStand.pres			= PRSNT_NODEF;
-		usrServInfoA->cdeStand.val			= 0x0;				/* ITU-T standardized coding */
-		usrServInfoA->tranMode.pres			= PRSNT_NODEF;
-		usrServInfoA->tranMode.val			= 0x0;				/* circuit mode */
-		usrServInfoA->infoTranRate0.pres		= PRSNT_NODEF;
-		usrServInfoA->infoTranRate0.val		= 0x10;				/* 64kbps origination to destination */
-		usrServInfoA->infoTranRate1.pres		= PRSNT_NODEF;
-		usrServInfoA->infoTranRate1.val		= 0x10;				/* 64kbps destination to origination */
-		usrServInfoA->chanStruct.pres		= PRSNT_NODEF;
-		usrServInfoA->chanStruct.val			= 0x1;				/* 8kHz integrity */
-		usrServInfoA->config.pres			= PRSNT_NODEF;
-		usrServInfoA->config.val				= 0x0;				/* point to point configuration */
-		usrServInfoA->establish.pres			= PRSNT_NODEF;
-		usrServInfoA->establish.val			= 0x0;				/* on demand */
-		usrServInfoA->symmetry.pres			= PRSNT_NODEF;
-		usrServInfoA->symmetry.val			= 0x0;				/* bi-directional symmetric */
-		usrServInfoA->usrInfLyr1Prot.pres	= PRSNT_NODEF;
-		usrServInfoA->usrInfLyr1Prot.val		= 0x2;				/* G.711 ulaw */
-		usrServInfoA->rateMultiplier.pres	= PRSNT_NODEF;
-		usrServInfoA->rateMultiplier.val		= 0x1;				/* 1x rate multipler */
-	} /* if ANSI */
+	usrServInfoA->cdeStand.pres			= PRSNT_NODEF;
+	usrServInfoA->cdeStand.val			= 0x0;				/* ITU-T standardized coding */
+	usrServInfoA->tranMode.pres			= PRSNT_NODEF;
+	usrServInfoA->tranMode.val			= 0x0;				/* circuit mode */
+	usrServInfoA->infoTranRate0.pres		= PRSNT_NODEF;
+	usrServInfoA->infoTranRate0.val		= 0x10;				/* 64kbps origination to destination */
+	usrServInfoA->infoTranRate1.pres		= PRSNT_NODEF;
+	usrServInfoA->infoTranRate1.val		= 0x10;				/* 64kbps destination to origination */
+	usrServInfoA->chanStruct.pres		= PRSNT_NODEF;
+	usrServInfoA->chanStruct.val			= 0x1;				/* 8kHz integrity */
+	usrServInfoA->config.pres			= PRSNT_NODEF;
+	usrServInfoA->config.val				= 0x0;				/* point to point configuration */
+	usrServInfoA->establish.pres			= PRSNT_NODEF;
+	usrServInfoA->establish.val			= 0x0;				/* on demand */
+	usrServInfoA->symmetry.pres			= PRSNT_NODEF;
+	usrServInfoA->symmetry.val			= 0x0;				/* bi-directional symmetric */
+	usrServInfoA->usrInfLyr1Prot.pres	= PRSNT_NODEF;
+	usrServInfoA->usrInfLyr1Prot.val		= 0x2;				/* G.711 ulaw */
+	usrServInfoA->rateMultiplier.pres	= PRSNT_NODEF;
+	usrServInfoA->rateMultiplier.val		= 0x1;				/* 1x rate multipler */
 	return FTDM_SUCCESS;
 }
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index a891c50108..8e327ea759 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -2205,7 +2205,7 @@ static int ftmod_ss7_fill_in_mtp2_link(sng_mtp2_link_t *mtp2Link)
 	if ( mtp2Link->t7 != 0 ) {
 		g_ftdm_sngss7_data.cfg.mtp2Link[i].t7		= mtp2Link->t7;
 	}else {
-		g_ftdm_sngss7_data.cfg.mtp2Link[i].t7		= 40;
+		g_ftdm_sngss7_data.cfg.mtp2Link[i].t7		= 20;
 	}
 
 	return FTDM_SUCCESS;