diff --git a/bin/ADMIN_keepalive_ALL.pl b/bin/ADMIN_keepalive_ALL.pl
index d3f10ba6..a8dedcea 100644
--- a/bin/ADMIN_keepalive_ALL.pl
+++ b/bin/ADMIN_keepalive_ALL.pl
@@ -844,6 +844,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 	open(sip, ">/etc/asterisk/sip-vicidial.conf") || die "can't open /etc/asterisk/sip-vicidial.conf: $!\n";
 	open(vm, ">/etc/asterisk/voicemail-vicidial.conf") || die "can't open /etc/asterisk/voicemail-vicidial.conf: $!\n";
 
+	print ext "; WARNING- THIS FILE IS AUTO-GENERATED BY VICIDIAL, ANY EDITS YOU MAKE WILL BE LOST\n";
 	print ext "[globals]\n";
 	print ext "$ext\n";
 	print ext "[vicidial-auto]\n";
@@ -851,14 +852,17 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 	print ext "$Lext\n";
 	print ext "$Pext\n";
 
+	print iax "; WARNING- THIS FILE IS AUTO-GENERATED BY VICIDIAL, ANY EDITS YOU MAKE WILL BE LOST\n";
 	print iax "$iax\n";
 	print iax "$Liax\n";
 	print iax "$Piax\n";
 
+	print sip "; WARNING- THIS FILE IS AUTO-GENERATED BY VICIDIAL, ANY EDITS YOU MAKE WILL BE LOST\n";
 	print sip "$sip\n";
 	print sip "$Lsip\n";
 	print sip "$Psip\n";
 
+	print vm "; WARNING- THIS FILE IS AUTO-GENERATED BY VICIDIAL, ANY EDITS YOU MAKE WILL BE LOST\n";
 	print vm "[vicidial-auto]\n";
 	print vm "$vm\n";
 
diff --git a/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt b/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt
index e365336c..bf83d3b1 100644
--- a/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt
+++ b/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt
@@ -441,6 +441,7 @@ MODIFY A CARRIER RECORD||
 DELETE THIS CARRIER||
 CARRIERS WITHIN THIS SERVER||
 CONF TEMPLATE LISTINGS||
+CARRIER LISTINGS||
 PHONES USING THIS CONF TEMPLATE||
 CARRIERS USING THIS CONF TEMPLATE||
 Conf Override:||
diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php
index b8646261..0ccd5ace 100644
--- a/www/vicidial/admin.php
+++ b/www/vicidial/admin.php
@@ -10248,7 +10248,7 @@ if ($ADD==411111111111)
 				$stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active',balance_trunks_offlimits='$balance_trunks_offlimits',recording_web_link='$recording_web_link',alt_server_ip='$alt_server_ip',active_asterisk_server='$active_asterisk_server',generate_vicidial_conf='$generate_vicidial_conf',rebuild_conf_files='$rebuild_conf_files' where server_id='$old_server_id';";
 				$rslt=mysql_query($stmt, $link);
 
-				$stmt="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$server_ip';";
+				$stmt="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y';";
 				$rslt=mysql_query($stmt, $link);
 
 				### LOG CHANGES TO LOG FILE ###
@@ -18574,7 +18574,7 @@ if ($ADD==130000000000)
 	}
 
 ######################
-# ADD=140000000000 display all conf templates
+# ADD=140000000000 display all carriers
 ######################
 if ($ADD==140000000000)
 	{
@@ -18585,11 +18585,11 @@ if ($ADD==140000000000)
 	$rslt=mysql_query($stmt, $link);
 	$carriers_to_print = mysql_num_rows($rslt);
 
-	echo "<br>CONF TEMPLATE LISTINGS:\n";
+	echo "<br>CARRIER LISTINGS:\n";
 	echo "<center><TABLE width=$section_width cellspacing=0 cellpadding=1>\n";
 	echo "<tr bgcolor=black>";
-	echo "<td><font size=1 color=white align=left><B>Template ID</B></td>";
-	echo "<td><font size=1 color=white><B>Template Name</B></td>";
+	echo "<td><font size=1 color=white align=left><B>Carrier ID</B></td>";
+	echo "<td><font size=1 color=white><B>Carrier Name</B></td>";
 	echo "<td><font size=1 color=white><B>Server IP</B></td>";
 	echo "<td><font size=1 color=white><B>Protocol</B></td>";
 	echo "<td><font size=1 color=white><B>Registration</B></td>";