diff --git a/resources/install/scripts/follow_me.lua b/resources/install/scripts/follow_me.lua
index ec8a71b7e2..cb93ba57a2 100644
--- a/resources/install/scripts/follow_me.lua
+++ b/resources/install/scripts/follow_me.lua
@@ -16,7 +16,7 @@
 --
 --	The Initial Developer of the Original Code is
 --	Mark J Crane <markjcrane@fusionpbx.com>
---	Copyright (C) 2010-2018
+--	Copyright (C) 2010-2019
 --	the Initial Developer. All Rights Reserved.
 --
 --	Contributor(s):
@@ -80,7 +80,7 @@
 	local number_alias = row.number_alias or '';
 	local accountcode = row.accountcode;
 	local follow_me_uuid = row.follow_me_uuid;
-	local enabled = row.follow_me_enabled;
+	local follow_me_enabled = row.follow_me_enabled;
 
 --determine whether to update the dial string
 	sql = "select follow_me_enabled, cid_name_prefix, cid_number_prefix, dial_string "
@@ -95,13 +95,13 @@
 	row = dbh:first_row(sql, params)
 	if not row then return end
 
-	--local enabled = row.follow_me_enabled;
+	--local follow_me_enabled = row.follow_me_enabled;
 	local cid_name_prefix = row.cid_name_prefix;
 	local cid_number_prefix = row.cid_number_prefix;
 	local dial_string = row.dial_string;
 
 --set follow me
-	if (enabled == "false") then
+	if (follow_me_enabled == "false") then
 		--play a tone
 			channel_display(session:get_uuid(), "Activated")
 
@@ -112,7 +112,7 @@
 	end
 
 --unset follow me
-	if (enabled == "true") then
+	if (follow_me_enabled == "true") then
 		--play a tone
 			channel_display(session:get_uuid(), "Cancelled")
 
@@ -123,8 +123,9 @@
 	end
 
 --enable or disable follow me
-	sql = "update v_extensions set ";
-	if (enabled == "true") then
+	sql = "update v_follow_me set ";
+	sql = sql .. "dial_string = null, ";
+	if (follow_me_enabled == "true") then
 		sql = sql .. "follow_me_enabled = 'false' ";
 	else
 		sql = sql .. "follow_me_enabled = 'true' ";
@@ -139,12 +140,13 @@
 
 --update the extension
 	sql = "update v_extensions set ";
-	if (enabled == "true") then
-		sql = sql .. "dial_string = null, ";
-	else
-		sql = sql .. "dial_string = :dial_string, ";
-	end
+	sql = sql .. "dial_string = null, ";
 	sql = sql .. "do_not_disturb = 'false', ";
+	if (follow_me_enabled == "true") then
+		sql = sql .. "follow_me_enabled = 'false' ";
+	else
+		sql = sql .. "follow_me_enabled = 'true' ";
+	end
 	sql = sql .. "forward_all_enabled= 'false' ";
 	sql = sql .. "where domain_uuid = :domain_uuid ";
 	sql = sql .. "and extension_uuid = :extension_uuid ";