diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
index faf5b58436..70190f78f8 100644
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
+++ b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
@@ -143,3 +143,6 @@ HTTP_RESPONSE_TIMEOUT=6000
 
 # If set to true RestComm will NOT use cache for *.wav files playback.If set to false RestComm will use cache for *.wav files playback.
 CACHE_NO_WAV=false
+
+#MSS Configuration
+TLS_CLIENT_AUTH_TYPE="Disabled" #Possible values Enabled, Want, Disabled,DisabledAll
\ No newline at end of file
diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh
index e25d9e9e39..64f2c755af 100755
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh
+++ b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh
@@ -142,8 +142,8 @@ CertConfigure(){
 MssStackConf(){
 	FILE=$RESTCOMM_CONF/mss-sip-stack.properties
 
-	if  grep -q 'gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE=Disabled' "$FILE"; then
-   		sed -i '/gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE=Disabled/,+5d' $FILE
+	if  grep -q "gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE=${TLS_CLIENT_AUTH_TYPE}" "$FILE"; then
+   		sed -i '/gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE='"$TLS_CLIENT_AUTH_TYPE"'/,+5d' $FILE
  	fi
 
 	if [[ "$TRUSTSTORE_FILE" = /* ]]; then
@@ -157,7 +157,7 @@ MssStackConf(){
 
 
     sed -i '/org.mobicents.ha.javax.sip.LOCAL_SSL_PORT='"$HTTPS_PORT"'/ a \
-    \gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE=Disabled\
+    \gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE='"$TLS_CLIENT_AUTH_TYPE"'\
     \javax.net.ssl.keyStore='"$TRUSTSTORE_LOCATION"'\
     \javax.net.ssl.keyStorePassword='" $TRUSTSTORE_PASSWORD"'\
     \javax.net.ssl.trustStorePassword='"$TRUSTSTORE_PASSWORD"'\