diff --git a/plugins/two-factor-auth/index.php b/plugins/two-factor-auth/index.php
index 1a4b394e3..a4b5a2be6 100644
--- a/plugins/two-factor-auth/index.php
+++ b/plugins/two-factor-auth/index.php
@@ -44,29 +44,23 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 			if ($aData && isset($aData['IsSet'], $aData['Enable']) && !empty($aData['Secret']) && $aData['IsSet'] && $aData['Enable']) {
 				$sCode = \trim($this->jsonParam('totp_code', ''));
 				if (empty($sCode)) {
-					$this->Logger()->Write('TFA: Required Code for ' . $oAccount->ParentEmailHelper() . ' account.');
-
+					$this->Logger()->Write("TFA: Required Code for {$oAccount->ParentEmailHelper()} account.");
 					throw new ClientException(static::AccountTwoFactorAuthRequired);
-				} else {
-					$this->Logger()->Write('TFA: Verify Code for ' . $oAccount->ParentEmailHelper() . ' account.');
+				}
 
-					$bUseBackupCode = false;
-					if (6 < \strlen($sCode) && !empty($aData['BackupCodes'])) {
-						$aBackupCodes = \explode(' ', \trim(\preg_replace('/[^\d]+/', ' ', $aData['BackupCodes'])));
-						$bUseBackupCode = \in_array($sCode, $aBackupCodes);
-
-						if ($bUseBackupCode) {
-							$this->removeBackupCodeFromTwoFactorInfo($oAccount->ParentEmailHelper(), $sCode);
-						}
+				$this->Logger()->Write("TFA: Verify Code for {$oAccount->ParentEmailHelper()} account.");
+				$bUseBackupCode = false;
+				if (6 < \strlen($sCode) && !empty($aData['BackupCodes'])) {
+					$aBackupCodes = \explode(' ', \trim(\preg_replace('/[^\d]+/', ' ', $aData['BackupCodes'])));
+					$bUseBackupCode = \in_array($sCode, $aBackupCodes);
+					if ($bUseBackupCode) {
+						$this->removeBackupCodeFromTwoFactorInfo($oAccount->ParentEmailHelper(), $sCode);
 					}
+				}
 
-					if (!$bUseBackupCode && !$this->TwoFactorAuthProvider($oAccount)->VerifyCode($aData['Secret'], $sCode)) {
-						$this->Manager()->Actions()->loginErrorDelay();
-
-						$this->Manager()->Actions()->LoggerAuthHelper($oAccount);
-
-						throw new ClientException(static::AccountTwoFactorAuthError);
-					}
+				if (!$bUseBackupCode && !$this->TwoFactorAuthProvider($oAccount)->VerifyCode($aData['Secret'], $sCode)) {
+					$this->Manager()->Actions()->LoggerAuthHelper($oAccount);
+					throw new ClientException(static::AccountTwoFactorAuthError);
 				}
 			}
 		}
@@ -207,7 +201,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $this->jsonResponse(__FUNCTION__, $this->getTwoFactorInfo($oAccount, true));
 	}
 
-	protected function Logger() : \RainLoop\Providers\TwoFactorAuth
+	protected function Logger() : \MailSo\Log\Logger
 	{
 		return $this->Manager()->Actions()->Logger();
 	}
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index af8e48950..0ccb577dd 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -6,7 +6,7 @@
 			const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
 				placeholder = 'LOGIN/LABEL_VERIFICATION_CODE';
 			if (container) {
-				container.append(Element.fromHTML('<div class="controls">'
+				container.prepend(Element.fromHTML('<div class="controls">'
 					+ '<div class="input-append">'
 						+ '<input name="totp_code" type="text" class="input-block-level inputIcon"'
 						+ ' pattern="[0-9]*" inputmode="numeric"'