diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index cf75a8fa51a..6ce69369e6b 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -81,7 +81,8 @@ class WebsiteUiSuite(unittest.TestSuite):
         self._options['db'] = tools.config.get('db_name', '')
         # TODO Use correct key
         self._options['user'] = 'admin'
-        self._options['password'] = tools.config.get('admin_passwd', 'admin')
+        self._options['admin_password'] = tools.config.get('admin_passwd', 'admin')
+        self._options['db_password'] = tools.config.get('db_password', 'admin')
 
         phantom = subprocess.Popen([
                 'phantomjs',
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index d3a49ae294a..3391899e83f 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -25,11 +25,12 @@ function run (test) {
     var host = options.host ? options.host : 'localhost';
     var port = options.port ? ':'+options.port : '';
     var path = options.path ? options.path : '/web';
-    var params = [];
+    var params = [ 'mod=*' ];
     if (options.action) params.push('action='+options.action);
-    //if (options.db) params.push('source='+options.db);
+    if (options.db) params.push('source='+options.db);
     if (options.user) params.push('login='+options.user);
-    if (options.password) params.push('password='+options.password);
+    if (options.admin_password) params.push('password='+options.admin_password);
+    if (options.db_password) params.push('supadmin='+options.db_password);
     var url = scheme+host+port+path+'#'+params.join('&');
     var page = require('webpage').create();
     page.viewportSize = { width: 1920, height: 1080 };