diff --git a/resources/install/scripts/call_forward.lua b/resources/install/scripts/call_forward.lua
index bf82217b90..31aedb9b54 100644
--- a/resources/install/scripts/call_forward.lua
+++ b/resources/install/scripts/call_forward.lua
@@ -213,6 +213,17 @@
 				dbh:query(sql);
 			end
 
+		--check the destination
+			if (forward_all_destination == "nil") then
+				enabled = false;
+				forward_all_enabled = "false";
+			else
+				if (string.len(forward_all_destination) == 0) then
+					enabled = false;
+					forward_all_enabled = "false";	
+				end	
+			end
+
 		--update the extension
 			if (session:ready()) then
 				sql = "update v_extensions set ";
@@ -222,6 +233,7 @@
 					sql = sql .. "do_not_disturb = 'false', ";
 				else
 					sql = sql .. "dial_string = null, ";
+					sql = sql .. "forward_all_destination = null, ";
 				end
 				sql = sql .. "forward_all_enabled = '"..forward_all_enabled.."' ";
 				sql = sql .. "where domain_uuid = '"..domain_uuid.."' ";