diff --git a/voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE b/voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
index d64bb24f7..358c64578 100644
--- a/voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
@@ -1,2 +1,2 @@
-#exec echo "register => |TRANSPORT|://|USER|@|DOMAIN|:$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|"
+#exec echo 'register => |TRANSPORT|://|USER|@|DOMAIN|:'$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)'|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|'
 
diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client
index eb984b462..578e32eea 100755
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -721,6 +721,10 @@ configure_sip_provider()
 	config_get transport $1 transport
 	config_get encryption $1 encryption
 
+	# This is a hack to fix security issue #14962
+	user=${user//"'"/}
+	authuser=${authuser//"'"/}
+
 	if [ -z "$transport" ] ; then 
 		transport="udp" 
 	fi