diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 5c25c3f5..b99f65a5 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -36,11 +36,9 @@ module.exports = function(){
         req.params.interactivity = req.params.interactivity || 'cartodb_id';
 
         req.params.processXML = function(req, xml, callback) {
-          if ( req.dbuser ) {
-            // Only edit XML when authenticated
-            if ( ! me.rx_dbuser ) me.rx_dbuser = /(<Parameter name="user"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/;
-            xml = xml.replace(me.rx_dbuser, "$1" + req.dbuser + "$2");
-          }
+          var dbuser = req.dbuser ? req.dbuser : global.settings.postgres.user;
+          if ( ! me.rx_dbuser ) me.rx_dbuser = /(<Parameter name="user"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/;
+          xml = xml.replace(me.rx_dbuser, "$1" + dbuser + "$2");
           callback(null, xml);
         }