diff --git a/server.js b/server.js
index 746838cc7a..ec37238fb7 100644
--- a/server.js
+++ b/server.js
@@ -12,6 +12,7 @@ var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080,
     ip   = process.env.IP   || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0',
     mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL,
     mongoURLLabel = "";
+    mongoDatabase = process.env.MONGODB_DATABASE;
 
 if (mongoURL == null) {
   var mongoHost, mongoPort, mongoDatabase, mongoPassword, mongoUser;
@@ -64,12 +65,13 @@ var initDb = function(callback) {
       return;
     }
 
+    conn = conn.db(mongoDatabase);  
     db = conn;
     dbDetails.databaseName = db.databaseName;
     dbDetails.url = mongoURLLabel;
     dbDetails.type = 'MongoDB';
 
-    console.log('Connected to MongoDB at: %s', mongoURL);
+    console.log('Connected to MongoDB at: %s using %s', mongoURL, dbDetails.databaseName);
   });
 };