diff --git a/config/env/all.js b/config/env/all.js
index 583f366f..bf0cc22b 100755
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -11,7 +11,8 @@ module.exports = {
 		uri: process.env.MONGOLAB_URI || process.env.MONGODB_URI || 'mongodb://'+ (process.env.DB_PORT_27017_TCP_ADDR  || '127.0.0.1') + '/mean',
 		options: {
 			user: '',
-			pass: ''
+			pass: '',
+			useMongoClient: true
 		}
 	},
 	
diff --git a/config/env/development.js b/config/env/development.js
index a44816a7..202ea79a 100755
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -7,7 +7,8 @@ module.exports = {
 		uri: process.env.MONGODB_URI || 'mongodb://'+( process.env.DB_PORT_27017_TCP_ADDR || '127.0.0.1') +'/mean',
 		options: {
 			user: '',
-			pass: ''
+			pass: '',
+			useMongoClient: true
 		}
 	},
     log: {
diff --git a/config/env/production.js b/config/env/production.js
index 08ebc529..5dfc8ee0 100755
--- a/config/env/production.js
+++ b/config/env/production.js
@@ -4,6 +4,9 @@ module.exports = {
 	baseUrl: process.env.BASE_URL || process.env.HEROKU_APP_NAME + '.herokuapp.com' || 'tellform.com',
 	db: {
 		uri: process.env.MONGODB_URI || process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_PORT_27017_TCP_ADDR || '127.0.0.1') + '/mean',
+		options: {
+			useMongoClient: true
+		}
 	},
 	port: process.env.PORT || 5000,
 	socketUrl: process.env.SOCKET_URL || 'ws.tellform.com',
diff --git a/config/env/test.js b/config/env/test.js
index c6731236..fceeb365 100755
--- a/config/env/test.js
+++ b/config/env/test.js
@@ -6,7 +6,8 @@ module.exports = {
 		uri: 'mongodb://localhost/mean-test',
 		options: {
 			user: '',
-			pass: ''
+			pass: '',
+			useMongoClient: true
 		}
 	},
 	port: 3001,
diff --git a/config/express.js b/config/express.js
index d5f21587..febb14c1 100755
--- a/config/express.js
+++ b/config/express.js
@@ -232,13 +232,14 @@ module.exports = function(db) {
 	// CookieParser should be above session
 	app.use(cookieParser());
 
+	debugger;
 	// Express MongoDB session storage
 	app.use(session({
 		saveUninitialized: true,
 		resave: true,
 		secret: config.sessionSecret,
 		store: new MongoStore({
-	      mongooseConnection: db.connection,
+	      mongooseConnection: mongoose.connection,
 	      collection: config.sessionCollection
 	    }),
 		cookie: config.sessionCookie,