diff --git a/resources/install/scripts/call_forward.lua b/resources/install/scripts/call_forward.lua
index 95cbce7c3a..553a883c20 100644
--- a/resources/install/scripts/call_forward.lua
+++ b/resources/install/scripts/call_forward.lua
@@ -128,7 +128,7 @@
 				status = dbh:query(sql, function(row)
 					extension_uuid = row.extension_uuid;
 					extension = row.extension;
-					number_alias = row.number_alias;
+					number_alias = row.number_alias or '';
 					accountcode = row.accountcode;
 					forward_all_enabled = row.forward_all_enabled;
 					forward_all_destination = row.forward_all_destination;
@@ -256,15 +256,18 @@
 					freeswitch.consoleLog("notice", "[call_forward] "..sql.."\n");
 				end
 				dbh:query(sql);
-			end
 
-		--clear the cache and hangup
-			if (session:ready()) then
 				--clear the cache
 					if (extension ~= nil) then
 						api:execute("memcache", "delete directory:"..extension.."@"..domain_name);
+						if #number_alias > 0 then
+							api:execute("memcache", "delete directory:"..number_alias.."@"..domain_name);
+						end
 					end
+			end
 
+		-- hangup
+			if (session:ready()) then
 				--wait for the file to be written before proceeding
 					session:sleep(100);
 
diff --git a/resources/install/scripts/do_not_disturb.lua b/resources/install/scripts/do_not_disturb.lua
index 25e0f900a8..8e067860af 100644
--- a/resources/install/scripts/do_not_disturb.lua
+++ b/resources/install/scripts/do_not_disturb.lua
@@ -82,7 +82,7 @@
 			end
 			status = dbh:query(sql, function(row)
 				extension = row.extension;
-				number_alias = row.number_alias;
+				number_alias = row.number_alias or '';
 				accountcode = row.accountcode;
 				follow_me_uuid = row.follow_me_uuid;
 				--freeswitch.consoleLog("NOTICE", "[do_not_disturb] extension "..row.extension.."\n");
@@ -145,6 +145,9 @@
 		--clear the cache
 			if (extension ~= nil) then
 				api:execute("memcache", "delete directory:"..extension.."@"..domain_name);
+				if #number_alias > 0 then
+					api:execute("memcache", "delete directory:"..number_alias.."@"..domain_name);
+				end
 			end
 
 		--wait for the file to be written before proceeding
diff --git a/resources/install/scripts/follow_me.lua b/resources/install/scripts/follow_me.lua
index bfacd96359..5dce059ae0 100644
--- a/resources/install/scripts/follow_me.lua
+++ b/resources/install/scripts/follow_me.lua
@@ -81,7 +81,7 @@
 			end
 			status = dbh:query(sql, function(row)
 				extension = row.extension;
-				number_alias = row.number_alias;
+				number_alias = row.number_alias or '';
 				accountcode = row.accountcode;
 				follow_me_uuid = row.follow_me_uuid;
 				--freeswitch.consoleLog("NOTICE", "[call forward] extension "..row.extension.."\n");
@@ -165,6 +165,9 @@
 		--clear the cache
 			if (extension ~= nil) then
 				api:execute("memcache", "delete directory:"..extension.."@"..domain_name);
+				if #number_alias > 0 then
+					api:execute("memcache", "delete directory:"..number_alias.."@"..domain_name);
+				end
 			end
 	
 		--wait for the file to be written before proceeding