diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php
index b610b5c56e..93672f8a80 100644
--- a/app/calls/resources/classes/call_forward.php
+++ b/app/calls/resources/classes/call_forward.php
@@ -77,7 +77,10 @@ include "root.php";
 					$dial_string .= ",extension_uuid=".$this->extension_uuid;
 					$dial_string .= ",toll_allow='".$this->toll_allow."'";
 					$dial_string .=",sip_h_Diversion=<sip:".$this->extension."@".$_SESSION['domain_name'].">;reason=unconditional";
-					if (strlen($this->accountcode) > 0) {
+					if (strlen($this->accountcode) == 0) {
+						$dial_string .= ",sip_h_X-accountcode=\${accountcode}";
+					}
+					else {
 						$dial_string .= ",sip_h_X-accountcode=".$this->accountcode;
 						$dial_string .= ",accountcode=".$this->accountcode;
 					}