diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 245e3f9e43..d4fa9d587e 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -367,12 +367,7 @@
 								//prepare the values for mwi account
 										if (strlen($mwi_account) > 0) {
 											if (strpos($mwi_account, '@') === false) {
-												if (count($_SESSION["domains"]) > 1) {
 													$mwi_account .= "@".$_SESSION['domain_name'];
-												}
-												else {
-													$mwi_account .= "@\$\${domain}";
-												}
 											}
 										}
 
@@ -477,9 +472,7 @@
 											$array["extensions"][$i]["nibble_account"] = $nibble_account;
 										}
 									}
-									if (strlen($mwi_account) > 0) {
-										$array["extensions"][$i]["mwi_account"] = $mwi_account;
-									}
+									$array["extensions"][$i]["mwi_account"] = $mwi_account;
 									$array["extensions"][$i]["sip_bypass_media"] = $sip_bypass_media;
 									if (permission_exists('extension_absolute_codec_string')) {
 										$array["extensions"][$i]["absolute_codec_string"] = $absolute_codec_string;