diff --git a/changelog.md b/changelog.md
index 5c5757aefd..3b1fb268cc 100644
--- a/changelog.md
+++ b/changelog.md
@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - OAuth is visible for LDAP users.
+- If you set `FIREFLY_III_LAYOUT=v2`, Firefly III will show you the new layout on pages where it's available. 
 
 ### Fixed
 - [Issue 4045](https://github.com/firefly-iii/firefly-iii/issues/4045) Error message for "Amount Missing" doesn't have a look up value
diff --git a/config/google2fa.php b/config/google2fa.php
index 34e719a2e1..98f6da2e85 100644
--- a/config/google2fa.php
+++ b/config/google2fa.php
@@ -76,7 +76,7 @@ return [
     /*
      * One Time Password View
      */
-    'view'                 => 'auth.mfa',
+    'view'                 => sprintf('%s.auth.mfa', env('FIREFLY_III_LAYOUT', 'v1')),
 
     /*
      * One Time Password error message