diff --git a/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php b/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php
index a6610a8e3..fdf44dae1 100644
--- a/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php
+++ b/src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php
@@ -1,9 +1,10 @@
 <?php namespace Jenssegers\Mongodb\Auth;
 
 use DateTime;
+use Illuminate\Auth\Passwords\DatabaseTokenRepository as BaseDatabaseTokenRepository;
 use MongoDate;
 
-class DatabaseTokenRepository extends \Illuminate\Auth\Passwords\DatabaseTokenRepository
+class DatabaseTokenRepository extends BaseDatabaseTokenRepository
 {
     /**
      * Build the record payload for the table.
@@ -28,9 +29,7 @@ protected function tokenExpired($token)
         // Convert MongoDate to a date string.
         if ($token['created_at'] instanceof MongoDate) {
             $date = new DateTime;
-
             $date->setTimestamp($token['created_at']->sec);
-
             $token['created_at'] = $date->format('Y-m-d H:i:s');
         } elseif (is_array($token['created_at']) and isset($token['created_at']['date'])) {
             $token['created_at'] = $token['created_at']['date'];
diff --git a/src/Jenssegers/Mongodb/Auth/PasswordBrokerManager.php b/src/Jenssegers/Mongodb/Auth/PasswordBrokerManager.php
new file mode 100644
index 000000000..fcb9e9415
--- /dev/null
+++ b/src/Jenssegers/Mongodb/Auth/PasswordBrokerManager.php
@@ -0,0 +1,22 @@
+<?php namespace Jenssegers\Mongodb\Auth;
+
+use Illuminate\Auth\Passwords\PasswordBrokerManager as BasePasswordBrokerManager;
+
+class PasswordBrokerManager extends BasePasswordBrokerManager
+{
+    /**
+     * Create a token repository instance based on the given configuration.
+     *
+     * @param  array  $config
+     * @return \Illuminate\Auth\Passwords\TokenRepositoryInterface
+     */
+    protected function createTokenRepository(array $config)
+    {
+        return new DatabaseTokenRepository(
+            $this->app['db']->connection(),
+            $config['table'],
+            $this->app['config']['app.key'],
+            $config['expire']
+        );
+    }
+}
diff --git a/src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php b/src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php
index a92ed974e..0bd3fdae1 100644
--- a/src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php
+++ b/src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php
@@ -1,8 +1,8 @@
 <?php namespace Jenssegers\Mongodb\Auth;
 
-use Jenssegers\Mongodb\Auth\DatabaseTokenRepository as DbRepository;
+use Illuminate\Auth\Passwords\PasswordResetServiceProvider as BasePasswordResetServiceProvider;
 
-class PasswordResetServiceProvider extends \Illuminate\Auth\Passwords\PasswordResetServiceProvider
+class PasswordResetServiceProvider extends BasePasswordResetServiceProvider
 {
     /**
      * Register the token repository implementation.
@@ -18,10 +18,28 @@ protected function registerTokenRepository()
             // interface, and is responsible for the actual storing of auth tokens and
             // their e-mail addresses. We will inject this table and hash key to it.
             $table = $app['config']['auth.password.table'];
+
             $key = $app['config']['app.key'];
+
             $expire = $app['config']->get('auth.password.expire', 60);
 
-            return new DbRepository($connection, $table, $key, $expire);
+            return new DatabaseTokenRepository($connection, $table, $key, $expire);
+        });
+    }
+
+    /**
+     * Register the password broker instance.
+     *
+     * @return void
+     */
+    protected function registerPasswordBroker()
+    {
+        $this->app->singleton('auth.password', function ($app) {
+            return new PasswordBrokerManager($app);
+        });
+
+        $this->app->bind('auth.password.broker', function ($app) {
+            return $app->make('auth.password')->broker();
         });
     }
 }