diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php
index 57d939ed3f..3efb8e5f60 100644
--- a/app/calls/resources/classes/follow_me.php
+++ b/app/calls/resources/classes/follow_me.php
@@ -329,13 +329,18 @@ include "root.php";
 					$dial_string .= ",origination_caller_id_number=$dial_string_caller_id_number";
 				}
 
-				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;
 				}
+
 				if ($this->toll_allow != '') {
 					$dial_string .= ",toll_allow='".$this->toll_allow."'";
 				}
+
 				$dial_string .= "}";
 				$x = 0;
 				if (is_array($result)) foreach ($result as &$row) {