diff --git a/extras/second_server_install.sql b/extras/second_server_install.sql
index a04332a0..6c2bef86 100644
--- a/extras/second_server_install.sql
+++ b/extras/second_server_install.sql
@@ -1,4 +1,4 @@
-INSERT INTO servers (server_id,server_description,server_ip,active,asterisk_version)values('TESTast','Test install of Asterisk server', '10.10.10.16','Y','1.2.26.2');
+INSERT INTO servers (server_id,server_description,server_ip,active,asterisk_version)values('TESTast','Test install of Asterisk server', '10.10.10.16','Y','1.4.21.2');
 
 INSERT INTO server_updater SET server_ip='10.10.10.16', last_update='';
 
diff --git a/extras/upgrade_2.2.0.sql b/extras/upgrade_2.2.0.sql
index ee3809a3..fb521193 100644
--- a/extras/upgrade_2.2.0.sql
+++ b/extras/upgrade_2.2.0.sql
@@ -542,7 +542,7 @@ ALTER TABLE vicidial_campaigns MODIFY web_form_address TEXT;
 ALTER TABLE vicidial_campaigns ADD web_form_address_two TEXT;
 ALTER TABLE vicidial_campaigns ADD waitforsilence_options VARCHAR(25) default '';
 ALTER TABLE vicidial_campaigns MODIFY am_message_exten VARCHAR(100) default 'vm-goodbye';
-UPDATE vicidial_campaigns SET am_message_exten='vm-goodbye';
+UPDATE vicidial_campaigns SET am_message_exten='vm-goodbye' where am_message_exten='';
 
 ALTER TABLE system_settings ADD db_schema_update_date DATETIME;
 ALTER TABLE system_settings ADD enable_second_webform ENUM('0','1') default '0';
diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php
index 05a641f1..05dd6ea8 100644
--- a/www/vicidial/admin.php
+++ b/www/vicidial/admin.php
@@ -8013,8 +8013,8 @@ if ($ADD=="2")
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -8022,7 +8022,7 @@ if ($ADD=="2")
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
@@ -8295,8 +8295,8 @@ if ($ADD=="2A")
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -8304,7 +8304,7 @@ if ($ADD=="2A")
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
@@ -9346,8 +9346,8 @@ if ($ADD==211111)
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -9355,7 +9355,7 @@ if ($ADD==211111)
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
@@ -10392,8 +10392,8 @@ if ($ADD=="4A")
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -10401,7 +10401,7 @@ if ($ADD=="4A")
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
@@ -10625,8 +10625,8 @@ if ($ADD=="4B")
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -10634,7 +10634,7 @@ if ($ADD=="4B")
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
@@ -10852,8 +10852,8 @@ if ($ADD==4)
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -10861,7 +10861,7 @@ if ($ADD==4)
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
@@ -12332,8 +12332,8 @@ if ($ADD==411111)
 				else
 					{
 					#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
-					# Get next available id from vtiger_groups_seq to use as groupid
-					$stmt="SELECT id from vtiger_groups_seq;";
+					# Get next available id from vtiger_users_seq to use as groupid
+					$stmt="SELECT id from vtiger_users_seq;";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					$row=mysql_fetch_row($rslt);
@@ -12341,7 +12341,7 @@ if ($ADD==411111)
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
 
 					# Increase next available groupid with 1 so next record gets proper id
-					$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+					$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 					if ($DB) {echo "$stmt\n";}
 					$rslt=mysql_query($stmt, $linkV);
 					if (!$rslt) {die('Could not execute: ' . mysql_error());}
diff --git a/www/vicidial/vtiger_user.php b/www/vicidial/vtiger_user.php
index 4aadbb37..f53a989a 100644
--- a/www/vicidial/vtiger_user.php
+++ b/www/vicidial/vtiger_user.php
@@ -139,8 +139,8 @@ while ($i < $VD_groups_ct)
 		{
 		#### BEGIN CREATE NEW GROUP RECORD IN VTIGER
 
-		# Get next available id from vtiger_groups_seq to use as groupid
-		$stmt="SELECT id from vtiger_groups_seq;";
+		# Get next available id from vtiger_users_seq to use as groupid
+		$stmt="SELECT id from vtiger_users_seq;";
 		if ($DB) {echo "$stmt\n";}
 		$rslt=mysql_query($stmt, $linkV);
 		$row=mysql_fetch_row($rslt);
@@ -149,7 +149,7 @@ while ($i < $VD_groups_ct)
 		$VTugID[$i] = $groupid;
 
 		# Increase next available groupid with 1 so next record gets proper id
-		$stmt="UPDATE vtiger_groups_seq SET id = '$groupid';";
+		$stmt="UPDATE vtiger_users_seq SET id = '$groupid';";
 		if ($DB) {echo "$stmt\n";}
 		$rslt=mysql_query($stmt, $linkV);
 		if (!$rslt) {die('Could not execute: ' . mysql_error());}