diff --git a/common/djangoapps/xmodule_modifiers.py b/common/djangoapps/xmodule_modifiers.py
index 982d47efaa..58dbbd7c6e 100644
--- a/common/djangoapps/xmodule_modifiers.py
+++ b/common/djangoapps/xmodule_modifiers.py
@@ -110,6 +110,7 @@ def add_histogram(get_html, module, user):
                          'element_id': module.location.html_id().replace('-','_'),
                          'edit_link': edit_link,
                          'user': user,
+                         'xqa_server' : settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu'),
                          'histogram': json.dumps(histogram),
                          'render_histogram': render_histogram,
                          'module_content': get_html()}
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index bc5b621b32..1c40a936af 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -62,6 +62,7 @@ SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
 ################################ LMS Migration #################################
 MITX_FEATURES['ENABLE_LMS_MIGRATION'] = True
 MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = False   # require that user be in the staff_* group to be able to enroll
+MITX_FEATURES['USE_XQA_SERVER'] = 'http://xqa:server@content-qa.mitx.mit.edu'
 
 LMS_MIGRATION_ALLOWED_IPS = ['127.0.0.1']
 
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index c58a35f082..ba695e193e 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -20,6 +20,7 @@ MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = True	  # require that user be
 myhost = socket.gethostname()
 if ('edxvm' in myhost) or ('ocw' in myhost):
     MITX_FEATURES['DISABLE_LOGIN_BUTTON'] = True	# auto-login with MIT certificate
+    MITX_FEATURES['USE_XQA_SERVER'] = 'https://qisx.mit.edu/xqa'	# needs to be ssl or browser blocks it
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')	# django 1.4 for nginx ssl proxy
 
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index f3dabb03b1..f91decf876 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -75,7 +75,7 @@ function sendlog_${element_id}(){
            entry: $('#${element_id}_xqa_entry').val()};
  
     $.ajax({
-        url: 'http://xqa:server@content-qa.mitx.mit.edu/log',
+        url: '${xqa_server}/log',
         type: 'GET',
         contentType: 'application/json',
         data: JSON.stringify(xqaLog),
@@ -101,7 +101,7 @@ var xqaQuery = {authkey: '${xqa_key}',
            format: 'html'};
  
 $.ajax({
-        url: 'http://xqa:server@content-qa.mitx.mit.edu/query',
+        url: '${xqa_server}/query',
         type: 'GET',
         contentType: 'application/json',
         data: JSON.stringify(xqaQuery),