diff --git a/composer.json b/composer.json
index 67a3b33ad9..a82586a995 100644
--- a/composer.json
+++ b/composer.json
@@ -49,8 +49,8 @@
     "php": ">=7.1.0",
     "ext-bcmath": "*",
     "ext-curl": "*",
-    "ext-intl": "*",
     "ext-gd": "*",
+    "ext-intl": "*",
     "ext-mbstring": "*",
     "ext-zip": "*",
     "bacon/bacon-qr-code": "1.*",
@@ -62,6 +62,7 @@
     "league/commonmark": "0.*",
     "league/csv": "9.*",
     "pragmarx/google2fa": "2.*",
+    "pragmarx/google2fa-laravel": "^0.1.4",
     "rcrowe/twigbridge": "0.9.*",
     "rmccue/requests": "1.*",
     "twig/twig": "1.*",
diff --git a/composer.lock b/composer.lock
index 23813f5c60..a2d3bac8c7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "b1ada57ba3af7146b2c86ff1f6e237cc",
+    "content-hash": "b65015e818e8643480e794b418268e97",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -1507,6 +1507,77 @@
             ],
             "time": "2017-09-12T06:55:05+00:00"
         },
+        {
+            "name": "pragmarx/google2fa-laravel",
+            "version": "v0.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antonioribeiro/google2fa-laravel.git",
+                "reference": "38bd96a1732b9dea963c52e0f503a65265c077c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/38bd96a1732b9dea963c52e0f503a65265c077c9",
+                "reference": "38bd96a1732b9dea963c52e0f503a65265c077c9",
+                "shasum": ""
+            },
+            "require": {
+                "laravel/framework": ">=5.2",
+                "php": ">=5.4",
+                "pragmarx/google2fa": "~2.0"
+            },
+            "require-dev": {
+                "benconstable/phpspec-laravel": "~3.0",
+                "phpspec/phpspec": "~3"
+            },
+            "suggest": {
+                "bacon/bacon-qr-code": "Required to generate inline QR Codes.",
+                "pragmarx/recovery": "Generate recovery codes."
+            },
+            "type": "library",
+            "extra": {
+                "component": "package",
+                "frameworks": [
+                    "Laravel"
+                ],
+                "branch-alias": {
+                    "dev-master": "0.1-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PragmaRX\\Google2FALaravel\\": "src/",
+                    "spec\\PragmaRX\\Google2FALaravel\\": "tests/spec/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Antonio Carlos Ribeiro",
+                    "email": "acr@antoniocarlosribeiro.com",
+                    "role": "Creator & Designer"
+                }
+            ],
+            "description": "A One Time Password Authentication package, compatible with Google Authenticator.",
+            "keywords": [
+                "Authentication",
+                "Two Factor Authentication",
+                "google2fa",
+                "laravel"
+            ],
+            "time": "2017-12-06T03:26:14+00:00"
+        },
         {
             "name": "psr/container",
             "version": "1.0.0",
@@ -5565,8 +5636,8 @@
         "php": ">=7.1.0",
         "ext-bcmath": "*",
         "ext-curl": "*",
-        "ext-intl": "*",
         "ext-gd": "*",
+        "ext-intl": "*",
         "ext-mbstring": "*",
         "ext-zip": "*"
     },
diff --git a/config/app.php b/config/app.php
index c8bfdfd482..80b7062006 100644
--- a/config/app.php
+++ b/config/app.php
@@ -76,11 +76,11 @@ return [
         FireflyIII\Providers\RouteServiceProvider::class,
 
         // own stuff:
-        //Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
-        //Barryvdh\Debugbar\ServiceProvider::class,
-        DaveJamesMiller\Breadcrumbs\ServiceProvider::class,
+//        Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
+//        Barryvdh\Debugbar\ServiceProvider::class,
+        DaveJamesMiller\Breadcrumbs\BreadcrumbsServiceProvider::class,
         TwigBridge\ServiceProvider::class,
-        PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
+        PragmaRX\Google2FALaravel\ServiceProvider::class,
 
         /*
          * More service providers.