diff --git a/config/initializers/mongo.rb b/config/initializers/mongo.rb
index 1b6e526..b9c1f9e 100644
--- a/config/initializers/mongo.rb
+++ b/config/initializers/mongo.rb
@@ -20,14 +20,22 @@ elsif ENV['HEROKU'] || ENV['USE_ENV']
   end
 
   Mongoid.configure do |config|
-    config.master = Mongo::Connection.new(
-      settings.host,
-      settings.port
-    ).db(database_name)
-    config.master.authenticate(settings.user, settings.password) if settings.user
+
+    hash = {
+      sessions: {
+        default: {
+          database: database_name,
+          hosts: [ "#{settings.host}:#{settings.port}" ]
+        }
+      },
+      options: { allow_dynamic_fields: false, use_activesupport_time_zone: true, identity_map_enabled: true }
+    }
+
+    if settings.user && settings.password
+      hash[:sessions][:default][:username] = settings.user
+      hash[:sessions][:default][:password] = settings.password
+    end
+
+    config.load_configuration(hash)
   end
 end
-
-Mongoid.allow_dynamic_fields = false
-Mongoid.use_activesupport_time_zone = true
-Mongoid.identity_map_enabled = true
--
libgit2 0.21.2