diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php
index c310e36d..61b94330 100644
--- a/www/vicidial/admin.php
+++ b/www/vicidial/admin.php
@@ -1908,6 +1908,8 @@ if (isset($_GET["entry_list_id"]))			{$entry_list_id=$_GET["entry_list_id"];}
 	elseif (isset($_POST["entry_list_id"]))	{$entry_list_id=$_POST["entry_list_id"];}
 if (isset($_GET["filter_entry_list_id"]))			{$filter_entry_list_id=$_GET["filter_entry_list_id"];}
 	elseif (isset($_POST["filter_entry_list_id"]))	{$filter_entry_list_id=$_POST["filter_entry_list_id"];}
+if (isset($_GET["allow_chats"]))			{$allow_chats=$_GET["allow_chats"];}
+	elseif (isset($_POST["allow_chats"]))	{$allow_chats=$_POST["allow_chats"];}
 
 
 if (isset($script_id)) {$script_id= strtoupper($script_id);}
@@ -2432,6 +2434,8 @@ if ($non_latin < 1)
 	$wrapup_after_hotkey = preg_replace('/[^0-9a-zA-Z]/','',$wrapup_after_hotkey);
 	$show_previous_callback = preg_replace('/[^0-9a-zA-Z]/','',$show_previous_callback);
 	$clear_script = preg_replace('/[^0-9a-zA-Z]/','',$clear_script);
+	$allow_chats = preg_replace('/[^0-9a-zA-Z]/','',$allow_chats);
+	$allow_emails = preg_replace('/[^0-9a-zA-Z]/','',$allow_emails);
 
 	### DIGITS and Dots
 	$server_ip = preg_replace('/[^\.0-9]/','',$server_ip);
@@ -3459,12 +3463,13 @@ else
 # 150307-1914 - Added login and leave3way custom sounds system settings options
 # 150313-0912 - Added DB Schema Version warning if mismatched with astguiclient.conf value
 # 150404-0932 - Added enable_did_entry_list_id and related DID options
+# 150421-2315 - Fixed bugs in allow_emails
 #
 
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time
 
-$admin_version = '2.12-480a';
-$build = '150404-0932';
+$admin_version = '2.12-481a';
+$build = '150421-2315';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -18815,7 +18820,7 @@ if ($ADD==31)
 			}
 		else
 			{
-			echo "<tr bgcolor=#B6D3FC><td align=right></td><td align=left><input type=hidden name=allow_emails value=$allow_emails></td></tr>\n";
+			echo "<tr bgcolor=#B6D3FC><td align=right></td><td align=left><input type=hidden name=allow_chats value=$allow_chats></td></tr>\n";
 			}
 		if ($SSoutbound_autodial_active > 0)
 			{
diff --git a/www/vicidial/admin_email_accounts.php b/www/vicidial/admin_email_accounts.php
index 3e63b371..0a8c0e64 100644
--- a/www/vicidial/admin_email_accounts.php
+++ b/www/vicidial/admin_email_accounts.php
@@ -1,7 +1,7 @@
 <?php
 # admin_email_accounts.php
 # 
-# Copyright (C) 2014  Joe Johnson, Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2015  Joe Johnson, Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 # This page manages the inbound email accounts in ViciDial
 #
@@ -14,10 +14,11 @@
 # 130902-0754 - Changed to mysqli PHP functions
 # 141007-1125 - Finalized adding QXZ translation to all admin files
 # 141230-0021 - Added code for on-the-fly language translations display
+# 150421-2255 - Fixed links to default list ID
 #
 
-$admin_version = '2.10-8';
-$build = '141230-0021';
+$admin_version = '2.12-9';
+$build = '150421-2255';
 
 $sh="emails"; 
 
@@ -608,7 +609,7 @@ else if ($eact == "ADD")
 		echo "$Dgroups_menu";
 		echo "</select>$NWB#email_accounts-in_group$NWE</td></tr>\n";
 
-		echo "<tr bgcolor=#B6D3FC><td align=right><a href=\"admin.php?ADD=1000\">"._QXZ("Default List ID")."</a>: </td><td align=left><input type=text name=default_list_id size=20 maxlength=255 value='$default_list_id'>$NWB#email_accounts-default_list_id$NWE</td></tr>\n";
+		echo "<tr bgcolor=#B6D3FC><td align=right><a href=\"admin.php?ADD=100\">"._QXZ("Default List ID")."</a>: </td><td align=left><input type=text name=default_list_id size=20 maxlength=255 value='$default_list_id'>$NWB#email_accounts-default_list_id$NWE</td></tr>\n";
 
 		echo "<tr bgcolor=#B6D3FC><td align=right>"._QXZ("In-Group Call Handle Method").": </td><td align=left><select size=1 name=call_handle_method><option>EMAIL</option><option>EMAILLOOKUP</option><option>EMAILLOOKUPRL</option><option>EMAILLOOKUPRC</option><option SELECTED>$call_handle_method</option></select>$NWB#email_accounts-call_handle_method$NWE</td></tr>\n";
 		echo "<tr bgcolor=#B6D3FC><td align=right>"._QXZ("In-Group Agent Search Method").": </td><td align=left><select size=1 name=agent_search_method><option value=\"LB\">LB - Load Balanced</option><option value=\"LO\">LO - Load Balanced Overflow</option><option value=\"SO\">SO - Server Only</option><option SELECTED>$agent_search_method</option></select>$NWB#email_accounts-agent_search_method$NWE</td></tr>\n";
@@ -792,7 +793,7 @@ else if (($eact=="DELETE" || $eact=="UPDATE") && $email_account_id)
 		echo "$Dgroups_menu";
 		echo "<option value='$group_id' selected>$group_id</option></select>$NWB#email_accounts-in_group$NWE</td></tr>\n";
 
-		echo "<tr bgcolor=#B6D3FC><td align=right><a href=\"admin.php?ADD=1000\">"._QXZ("Default List ID")."</a>: </td><td align=left><input type=text name=default_list_id size=20 maxlength=255 value='$default_list_id'>$NWB#email_accounts-default_list_id$NWE</td></tr>\n";
+		echo "<tr bgcolor=#B6D3FC><td align=right><a href=\"admin.php?ADD=311&list_id=$default_list_id\">"._QXZ("Default List ID")."</a>: </td><td align=left><input type=text name=default_list_id size=20 maxlength=255 value='$default_list_id'>$NWB#email_accounts-default_list_id$NWE</td></tr>\n";
 
 ###############
 		echo "<tr bgcolor=#B6D3FC><td align=right>"._QXZ("In-Group Call Handle Method").": </td><td align=left><select size=1 name=call_handle_method><option>EMAIL</option><option>EMAILLOOKUP</option><option>EMAILLOOKUPRL</option><option>EMAILLOOKUPRC</option><option SELECTED>$call_handle_method</option></select>$NWB#email_accounts-call_handle_method$NWE</td></tr>\n";