From 6f1fddfedf4bdd34603038521ed60f66863a5ff0 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Fri, 10 Jul 2020 12:49:22 -0400
Subject: [PATCH] Fix issue where a user with remembered-TFA was still getting
 a notice that they had to enable TFA

---
 wire/modules/Process/ProcessLogin/ProcessLogin.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wire/modules/Process/ProcessLogin/ProcessLogin.module b/wire/modules/Process/ProcessLogin/ProcessLogin.module
index 2c2f0ed0..951de306 100644
--- a/wire/modules/Process/ProcessLogin/ProcessLogin.module
+++ b/wire/modules/Process/ProcessLogin/ProcessLogin.module
@@ -897,7 +897,7 @@ class ProcessLogin extends Process implements ConfigurableModule {
 			$session->removeFor($this, 'copyVars');
 		}
 			
-		if(count($this->tfaRecRoleIDs) && !$this->tfaLoginSuccess) {
+		if(!$user->hasTfa() && count($this->tfaRecRoleIDs) && !$this->tfaLoginSuccess) {
 			// determine if Tfa module is installed and user has role requiring Tfa
 			$requireTfa = false;
 			if(count($this->wire('modules')->findByPrefix('Tfa'))) {