diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
index 73463563ef..9806d6a76d 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
@@ -44,6 +44,7 @@
 
 		--get the variables
 			dsn = trim(api:execute("global_getvar", "dsn"));
+			dsn_callcenter = trim(api:execute("global_getvar", "dsn_callcenter"));
 
 		--start the xml array
 			local xml = {}
@@ -52,8 +53,12 @@
 			table.insert(xml, [[    <section name="configuration">]]);
 			table.insert(xml, [[            <configuration name="callcenter.conf" description="Call Center">]]);
 			table.insert(xml, [[                    <settings>]]);
-			if (string.len(dsn) > 0) then
-				table.insert(xml, [[                            <param name="odbc-dsn" value="]]..database["switch"]..[["/>]]);
+			if (dsn_callcenter) then
+				table.insert(xml, [[                            <param name="odbc-dsn" value="]]..dsn_callcenter..[["/>]]);
+			else
+				if (string.len(dsn) > 0) then
+					table.insert(xml, [[                            <param name="odbc-dsn" value="]]..database["switch"]..[["/>]]);
+				end
 			end
 			--table.insert(xml, [[                          <param name="dbname" value="/usr/local/freeswitch/db/call_center.db"/>]]);
 			table.insert(xml, [[                    </settings>]]);
@@ -156,136 +161,136 @@
 			table.insert(xml, [[                    </queues>]]);
 
 		--get the agents
-				table.insert(xml, [[                    <agents>]]);
-				sql = "select * from v_call_center_agents as a, v_domains as d ";
-				sql = sql .. "where d.domain_uuid = a.domain_uuid; ";
-				if (debug["sql"]) then
-					freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n");
-				end
-				x = 0;
-				dbh:query(sql, function(row)
-					--get the values from the database and set as variables
-						domain_uuid = row.domain_uuid;
-						domain_name = row.domain_name;
-						agent_name = row.agent_name;
-						agent_type = row.agent_type;
-						agent_call_timeout = row.agent_call_timeout;
-						agent_contact = row.agent_contact;
-						agent_status = row.agent_status;
-						agent_no_answer_delay_time = row.agent_no_answer_delay_time;
-						agent_max_no_answer = row.agent_max_no_answer;
-						agent_wrap_up_time = row.agent_wrap_up_time;
-						agent_reject_delay_time = row.agent_reject_delay_time;
-						agent_busy_delay_time = row.agent_busy_delay_time;
+			table.insert(xml, [[                    <agents>]]);
+			sql = "select * from v_call_center_agents as a, v_domains as d ";
+			sql = sql .. "where d.domain_uuid = a.domain_uuid; ";
+			if (debug["sql"]) then
+				freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n");
+			end
+			x = 0;
+			dbh:query(sql, function(row)
+				--get the values from the database and set as variables
+					domain_uuid = row.domain_uuid;
+					domain_name = row.domain_name;
+					agent_name = row.agent_name;
+					agent_type = row.agent_type;
+					agent_call_timeout = row.agent_call_timeout;
+					agent_contact = row.agent_contact;
+					agent_status = row.agent_status;
+					agent_no_answer_delay_time = row.agent_no_answer_delay_time;
+					agent_max_no_answer = row.agent_max_no_answer;
+					agent_wrap_up_time = row.agent_wrap_up_time;
+					agent_reject_delay_time = row.agent_reject_delay_time;
+					agent_busy_delay_time = row.agent_busy_delay_time;
 
-					--get and then set the complete agent_contact with the call_timeout and when necessary confirm
-							--confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1";
-							--if you change this variable also change app/call_center/call_center_agent_edit.php
-							confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1,group_confirm_read_timeout=2000,leg_timeout="..agent_call_timeout;
-							if (string.find(agent_contact, '}') == nil) then
+				--get and then set the complete agent_contact with the call_timeout and when necessary confirm
+						--confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1";
+						--if you change this variable also change app/call_center/call_center_agent_edit.php
+						confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1,group_confirm_read_timeout=2000,leg_timeout="..agent_call_timeout;
+						if (string.find(agent_contact, '}') == nil) then
+							--not found
+							if (string.find(agent_contact, 'sofia/gateway') == nil) then
+								--add the call_timeout
+								agent_contact = "{call_timeout="..agent_call_timeout.."}"..agent_contact;
+							else
+								--add the call_timeout and confirm
+								tmp_pos = string.find(agent_contact, "}");
+								tmp_first = string.sub(agent_contact, 0, tmp_pos);
+								tmp_last = string.sub(agent_contact, tmp_pos);
+								agent_contact = tmp_first..',call_timeout='..agent_call_timeout..tmp_last;
+								agent_contact = "{"..confirm..",call_timeout="..agent_call_timeout.."}"..agent_contact;
+							end
+						else
+							--found
+							if (string.find(agent_contact, 'sofia/gateway') == nil) then
 								--not found
-								if (string.find(agent_contact, 'sofia/gateway') == nil) then
-									--add the call_timeout
-									agent_contact = "{call_timeout="..agent_call_timeout.."}"..agent_contact;
+								if (string.find(agent_contact, 'call_timeout') == nil) then
+										--add the call_timeout
+										pos = string.find(agent_contact, "}");
+										first = string.sub(agent_contact, 0, pos);
+										last = string.sub(agent_contact, tmp_pos);
+										agent_contact = first..[[,call_timeout=]]..agent_call_timeout..last;
 								else
-									--add the call_timeout and confirm
-									tmp_pos = string.find(agent_contact, "}");
-									tmp_first = string.sub(agent_contact, 0, tmp_pos);
-									tmp_last = string.sub(agent_contact, tmp_pos);
-									agent_contact = tmp_first..',call_timeout='..agent_call_timeout..tmp_last;
-									agent_contact = "{"..confirm..",call_timeout="..agent_call_timeout.."}"..agent_contact;
+										--the string has the call timeout
+										agent_contact = agent_contact;
 								end
 							else
 								--found
-								if (string.find(agent_contact, 'sofia/gateway') == nil) then
-									--not found
-									if (string.find(agent_contact, 'call_timeout') == nil) then
-											--add the call_timeout
-											pos = string.find(agent_contact, "}");
-											first = string.sub(agent_contact, 0, pos);
-											last = string.sub(agent_contact, tmp_pos);
-											agent_contact = first..[[,call_timeout=]]..agent_call_timeout..last;
-									else
-											--the string has the call timeout
-											agent_contact = agent_contact;
-									end
+								pos = string.find(agent_contact, "}");
+								first = string.sub(agent_contact, 0, pos);
+								last = string.sub(agent_contact, pos);
+								if (stristr(agent_contact, 'call_timeout') == FALSE) then
+									--add the call_timeout and confirm
+									agent_contact = first..','..confirm..',call_timeout='..agent_call_timeout..last;
 								else
-									--found
-									pos = string.find(agent_contact, "}");
-									first = string.sub(agent_contact, 0, pos);
-									last = string.sub(agent_contact, pos);
-									if (stristr(agent_contact, 'call_timeout') == FALSE) then
-										--add the call_timeout and confirm
-										agent_contact = first..','..confirm..',call_timeout='..agent_call_timeout..last;
-									else
-										--add confirm
-										agent_contact = tmp_first..','..confirm..tmp_last;
-									end
+									--add confirm
+									agent_contact = tmp_first..','..confirm..tmp_last;
 								end
 							end
+						end
 
-					--build the xml string
-						table.insert(xml, [[                            <agent ]]);
-						table.insert(xml, [[                            	name="]]..agent_name..[[@]]..domain_name..[[" ]]);
-						table.insert(xml, [[                            	type="]]..agent_type..[[" ]]);
-						table.insert(xml, [[                            	contact="]]..agent_contact..[[" ]]);
-						table.insert(xml, [[                            	status="]]..agent_status..[[" ]]);
-						if (agent_no_answer_delay_time ~= nil) then
-							table.insert(xml, [[                            	no-answer-delay-time="]]..agent_no_answer_delay_time..[[" ]]);
-						end
-						if (agent_max_no_answer ~= nil) then
-							table.insert(xml, [[                            	max-no-answer="]]..agent_max_no_answer..[[" ]]);
-						end
-						if (agent_wrap_up_time ~= nil) then
-							table.insert(xml, [[                            	wrap-up-time="]]..agent_wrap_up_time..[[" ]]);
-						end
-						if (agent_reject_delay_time ~= nil) then
-							table.insert(xml, [[                            	reject-delay-time="]]..agent_reject_delay_time..[[" ]]);
-						end
-						if (agent_busy_delay_time ~= nil) then
-							table.insert(xml, [[                            	busy-delay-time="]]..agent_busy_delay_time..[[" ]]);
-						end
-						table.insert(xml, [[                            	/>]]);
-				end)
-				table.insert(xml, [[                    </agents>]]);
+				--build the xml string
+					table.insert(xml, [[                            <agent ]]);
+					table.insert(xml, [[                            	name="]]..agent_name..[[@]]..domain_name..[[" ]]);
+					table.insert(xml, [[                            	type="]]..agent_type..[[" ]]);
+					table.insert(xml, [[                            	contact="]]..agent_contact..[[" ]]);
+					table.insert(xml, [[                            	status="]]..agent_status..[[" ]]);
+					if (agent_no_answer_delay_time ~= nil) then
+						table.insert(xml, [[                            	no-answer-delay-time="]]..agent_no_answer_delay_time..[[" ]]);
+					end
+					if (agent_max_no_answer ~= nil) then
+						table.insert(xml, [[                            	max-no-answer="]]..agent_max_no_answer..[[" ]]);
+					end
+					if (agent_wrap_up_time ~= nil) then
+						table.insert(xml, [[                            	wrap-up-time="]]..agent_wrap_up_time..[[" ]]);
+					end
+					if (agent_reject_delay_time ~= nil) then
+						table.insert(xml, [[                            	reject-delay-time="]]..agent_reject_delay_time..[[" ]]);
+					end
+					if (agent_busy_delay_time ~= nil) then
+						table.insert(xml, [[                            	busy-delay-time="]]..agent_busy_delay_time..[[" ]]);
+					end
+					table.insert(xml, [[                            	/>]]);
+			end)
+			table.insert(xml, [[                    </agents>]]);
 
 		--get the tiers
-				sql = "select * from v_call_center_tiers as t, v_domains as d ";
-				sql = sql .. "where d.domain_uuid = t.domain_uuid; ";
-				if (debug["sql"]) then
-					freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n");
-				end
-				table.insert(xml, [[                    <tiers>]]);
-				dbh:query(sql, function(row)
-					--get the values from the database and set as variables
-						domain_uuid = row.domain_uuid;
-						domain_name = row.domain_name;
-						agent_name = row.agent_name;
-						queue_name = row.queue_name;
-						tier_level = row.tier_level;
-						tier_position = row.tier_position;
-					--build the xml
-						table.insert(xml, [[                            <tier ]]);
-						table.insert(xml, [[				agent="]]..agent_name..[[@]]..domain_name..[[" ]]);
-						table.insert(xml, [[				queue="]]..queue_name..[[@]]..domain_name..[[" ]]);
-						table.insert(xml, [[				level="]]..tier_level..[[" ]]);
-						table.insert(xml, [[				position="]]..tier_position..[[" ]]);
-						table.insert(xml, [[				/>]]);
-				end)
-				table.insert(xml, [[                    </tiers>]]);
+			sql = "select * from v_call_center_tiers as t, v_domains as d ";
+			sql = sql .. "where d.domain_uuid = t.domain_uuid; ";
+			if (debug["sql"]) then
+				freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n");
+			end
+			table.insert(xml, [[                    <tiers>]]);
+			dbh:query(sql, function(row)
+				--get the values from the database and set as variables
+					domain_uuid = row.domain_uuid;
+					domain_name = row.domain_name;
+					agent_name = row.agent_name;
+					queue_name = row.queue_name;
+					tier_level = row.tier_level;
+					tier_position = row.tier_position;
+				--build the xml
+					table.insert(xml, [[                            <tier ]]);
+					table.insert(xml, [[				agent="]]..agent_name..[[@]]..domain_name..[[" ]]);
+					table.insert(xml, [[				queue="]]..queue_name..[[@]]..domain_name..[[" ]]);
+					table.insert(xml, [[				level="]]..tier_level..[[" ]]);
+					table.insert(xml, [[				position="]]..tier_position..[[" ]]);
+					table.insert(xml, [[				/>]]);
+			end)
+			table.insert(xml, [[                    </tiers>]]);
 
 		--close the extension tag if it was left open
-				table.insert(xml, [[            </configuration>]]);
-				table.insert(xml, [[    </section>]]);
-				table.insert(xml, [[</document>]]);
-				XML_STRING = table.concat(xml, "\n");
-				if (debug["xml_string"]) then
-						freeswitch.consoleLog("notice", "[xml_handler] XML_STRING: " .. XML_STRING .. "\n");
-				end
+			table.insert(xml, [[            </configuration>]]);
+			table.insert(xml, [[    </section>]]);
+			table.insert(xml, [[</document>]]);
+			XML_STRING = table.concat(xml, "\n");
+			if (debug["xml_string"]) then
+					freeswitch.consoleLog("notice", "[xml_handler] XML_STRING: " .. XML_STRING .. "\n");
+			end
 
 		--close the database connection
-				dbh:release();
-				--freeswitch.consoleLog("notice", "[xml_handler]"..api:execute("eval ${dsn}"));
+			dbh:release();
+			--freeswitch.consoleLog("notice", "[xml_handler]"..api:execute("eval ${dsn}"));
 
 		--set the cache
 			result = trim(api:execute("memcache", "set configuration:callcenter.conf:" .. hostname .." '"..XML_STRING:gsub("'", "&#39;").."' ".."expire['callcenter.conf']"));