diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php
index e985968c..de79c891 100644
--- a/www/agc/vicidial.php
+++ b/www/agc/vicidial.php
@@ -614,10 +614,11 @@
 # 190529-2144 - Fix for shift enforcement dispo-call-url issue
 # 190617-1116 - Fix for script variable issue
 # 190627-2134 - Added new options for campaign agent_screen_time_display feature
+# 190723-1655 - Fix for script tab custom fields
 #
 
-$version = '2.14-583c';
-$build = '190627-2134';
+$version = '2.14-584c';
+$build = '190723-1655';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=87;
 $one_mysql_log=0;
@@ -15742,8 +15743,6 @@ else
 		"&web_vars=" + LIVE_web_vars + '' +
 		webform_session;
 
-		SCRIPTweb_form_vars = web_form_varsX;
-
 		if (custom_field_names.length > 2)
 			{
 			var url_custom_field='';
@@ -15767,6 +15766,8 @@ else
 			scriptformat='YES';
 			}
 
+		SCRIPTweb_form_vars = web_form_varsX;
+
 		web_form_varsX = web_form_varsX.replace(RGplus, '+');
 		web_form_varsX = web_form_varsX.replace(RGnl, '+');
 		web_form_varsX = web_form_varsX.replace(regWF, '');
@@ -15879,6 +15880,11 @@ else
 //			document.getElementById("debugbottomspan").innerHTML = CFN_debug;
 			}
 
+		if (custom_field_names.length > 2)
+			{
+			SCRIPTweb_form_vars = web_form_varsX;
+			}
+
 		if (webformnumber == '1')
 			{web_form_vars = web_form_varsX;}
 		if (webformnumber == '2')