diff --git a/conf/autoload_configs/voicemail.conf.xml b/conf/autoload_configs/voicemail.conf.xml
index d824fafd2e..dc2bcd62a4 100644
--- a/conf/autoload_configs/voicemail.conf.xml
+++ b/conf/autoload_configs/voicemail.conf.xml
@@ -2,7 +2,7 @@
   <settings>
   </settings>
   <profiles>
-    <profile name="default">
+    <profile name="$${domain}">
       <param name="file-extension" value="wav"/>
       <param name="terminator-key" value="#"/>
       <param name="max-login-attempts" value="3"/>
diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 5c75586a12..b2a3cc9a4f 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -145,7 +145,7 @@
 	<action application="set" data="voicemail_authorized=${sip_authorized}"/>
 	<action application="answer"/>
 	<action application="sleep" data="1000"/>
-	<action application="voicemail" data="check default $${domain} ${dialed_ext}"/>
+	<action application="voicemail" data="check $${domain} $${domain} ${dialed_ext}"/>
 	<!-- bind_meta_app can have these args <key> [a|b|ab] [a|b|o|s] <app> -->
 	<anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/>
 	<anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
@@ -162,7 +162,7 @@
 	<anti-action application="answer"/>
 	<!--<anti-action application="send_display" data="Voicemail for ${dialed_ext}"/>-->
 	<anti-action application="sleep" data="1000"/>
-	<anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/>
+	<anti-action application="voicemail" data="$${domain} $${domain} ${dialed_ext}"/>
       </condition>
     </extension>