diff --git a/browserid/lib/db_mysql.js b/browserid/lib/db_mysql.js
index 4bcb8d52e23cdf27b86a1791208600b80cec203f..eeef31847c80dd89f0470b9d08ee4b6f4f9ede21 100644
--- a/browserid/lib/db_mysql.js
+++ b/browserid/lib/db_mysql.js
@@ -94,13 +94,13 @@ exports.open = function(cfg, cb) {
   const defParams = {
     host: '127.0.0.1',
     port: "3306",
-    user: 'test',
-    password: 'pass',
+    user: undefined,
+    password: undefined,
     unit_test: false
   };
 
   Object.keys(defParams).forEach(function(param) {
-    client[param] = cfg[param] ? cfg[param] : defParams[param];
+    client[param] = cfg[param] !== undefined ? cfg[param] : defParams[param];
   });
 
   // let's figure out the database name
diff --git a/libs/configuration.js b/libs/configuration.js
index ecddccb7be0aa2f3e4767d3267531b8eed0c0fc4..b65422ad7eae7bad82676b84ff6b2401e5b7bed5 100644
--- a/libs/configuration.js
+++ b/libs/configuration.js
@@ -58,8 +58,7 @@ exports.get = function(val) {
 
 var defaultHostedDatabaseConfig = {
   driver: "mysql",
-  user: 'browserid',
-  password: 'browserid'
+  user: 'browserid'
 };
 
 // various deployment configurations