diff --git a/app/main/views/two_factor.py b/app/main/views/two_factor.py
index 231859e47..b2d9ae004 100644
--- a/app/main/views/two_factor.py
+++ b/app/main/views/two_factor.py
@@ -52,7 +52,7 @@ def two_factor_email(token):
             token,
             current_app.config['SECRET_KEY'],
             current_app.config['DANGEROUS_SALT'],
-            current_app.config['EMAIL_2FA_EXPIRY_SECONDS']
+            current_app.config['EMAIL_EXPIRY_SECONDS']
         ))
     except SignatureExpired:
         return render_template('views/email-link-invalid.html', redirect_url=redirect_url)
diff --git a/tests/app/main/views/test_two_factor.py b/tests/app/main/views/test_two_factor.py
index 64997c207..d4705006c 100644
--- a/tests/app/main/views/test_two_factor.py
+++ b/tests/app/main/views/test_two_factor.py
@@ -434,7 +434,7 @@ def test_two_factor_email_link_has_expired(
 ):
     client_request.logout()
 
-    with set_config(notify_admin, 'EMAIL_2FA_EXPIRY_SECONDS', -1):
+    with set_config(notify_admin, 'EMAIL_EXPIRY_SECONDS', -1):
         page = client_request.post_url(
             url_for_endpoint_with_token('main.two_factor_email', token=valid_token, next=redirect_url),
             _follow_redirects=True,