diff --git a/composer.json b/composer.json
index 74bb9ffd..9f9db699 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "guzzlehttp/guzzle": "^6.1",
         "jenssegers/date": "^3.0",
         "mccool/laravel-auto-presenter": "^4.1",
-        "pragmarx/google2fa": "^0.5",
+        "pragmarx/google2fa": "^0.7",
         "roumen/feed": "^2.9"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 1ef81e47..3373a593 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "fba338ed3288839c2e0e96b77456b911",
-    "content-hash": "6cf324173845e67b192c03cb4e3caf16",
+    "hash": "505aece503be603d6a922dcf810729ac",
+    "content-hash": "d8946ef08583fc6db5fc632635c2ff1b",
     "packages": [
         {
             "name": "alt-three/emoji",
@@ -172,6 +172,48 @@
             ],
             "time": "2014-07-28 07:22:35"
         },
+        {
+            "name": "bacon/bacon-qr-code",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Bacon/BaconQrCode.git",
+                "reference": "0537ed27917f5ae26e5837ac4bfd837171d0b848"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/0537ed27917f5ae26e5837ac4bfd837171d0b848",
+                "reference": "0537ed27917f5ae26e5837ac4bfd837171d0b848",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-gd": "to generate QR code images"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "BaconQrCode": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "http://www.dasprids.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "BaconQrCode is a QR code generator for PHP.",
+            "homepage": "https://github.com/Bacon/BaconQrCode",
+            "time": "2013-08-27 10:20:42"
+        },
         {
             "name": "barryvdh/laravel-cors",
             "version": "v0.5.0",
@@ -221,6 +263,60 @@
             ],
             "time": "2015-05-25 13:45:30"
         },
+        {
+            "name": "christian-riesen/base32",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ChristianRiesen/base32.git",
+                "reference": "fbe67d49d45dc789f942ef828c787550ebb894bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/fbe67d49d45dc789f942ef828c787550ebb894bc",
+                "reference": "fbe67d49d45dc789f942ef828c787550ebb894bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "satooshi/php-coveralls": "0.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Base32\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Riesen",
+                    "email": "chris.riesen@gmail.com",
+                    "homepage": "http://christianriesen.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Base32 encoder/decoder according to RFC 4648",
+            "homepage": "https://github.com/ChristianRiesen/base32",
+            "keywords": [
+                "base32",
+                "decode",
+                "encode",
+                "rfc4648"
+            ],
+            "time": "2015-09-27 23:45:02"
+        },
         {
             "name": "classpreloader/classpreloader",
             "version": "2.0.0",
@@ -2282,23 +2378,25 @@
         },
         {
             "name": "pragmarx/google2fa",
-            "version": "v0.5.0",
+            "version": "v0.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "ff92a3f979b7807a2219f895db92b5c28f2a5498"
+                "reference": "908678ba9b26cf8ecd7ddca6bfd86afc5b4874df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/ff92a3f979b7807a2219f895db92b5c28f2a5498",
-                "reference": "ff92a3f979b7807a2219f895db92b5c28f2a5498",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/908678ba9b26cf8ecd7ddca6bfd86afc5b4874df",
+                "reference": "908678ba9b26cf8ecd7ddca6bfd86afc5b4874df",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.7"
+                "christian-riesen/base32": "~1.0",
+                "php": ">=5.3.7",
+                "simplesoftwareio/simple-qrcode": "1.3.*"
             },
             "require-dev": {
-                "phpspec/phpspec": "~2.1@dev"
+                "phpspec/phpspec": "~2.1"
             },
             "type": "library",
             "extra": {
@@ -2330,7 +2428,7 @@
                 "google2fa",
                 "laravel"
             ],
-            "time": "2015-02-20 01:25:04"
+            "time": "2015-11-07 13:57:42"
         },
         {
             "name": "psr/http-message",
@@ -2542,6 +2640,57 @@
             ],
             "time": "2015-11-02 19:03:05"
         },
+        {
+            "name": "simplesoftwareio/simple-qrcode",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SimpleSoftwareIO/simple-qrcode.git",
+                "reference": "549c649826209984925364e52985c4c7284a4c33"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SimpleSoftwareIO/simple-qrcode/zipball/549c649826209984925364e52985c4c7284a4c33",
+                "reference": "549c649826209984925364e52985c4c7284a4c33",
+                "shasum": ""
+            },
+            "require": {
+                "bacon/bacon-qr-code": "1.0.*",
+                "ext-gd": "*",
+                "illuminate/support": ">=4.2.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "0.9.*",
+                "phpunit/phpunit": "4.7.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "SimpleSoftwareIO\\QrCode\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Simple Software LLC",
+                    "email": "support@simplesoftware.io"
+                }
+            ],
+            "description": "Simple QrCode is a QR code generator made for Laravel.",
+            "homepage": "http://www.simplesoftware.io",
+            "keywords": [
+                "Simple",
+                "generator",
+                "laravel",
+                "qrcode",
+                "wrapper"
+            ],
+            "time": "2015-09-18 00:38:04"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v5.4.1",