diff --git a/plugins/login-register/LoginRegister.js b/plugins/login-register/LoginRegister.js
index d7a0230ad..812bc449c 100644
--- a/plugins/login-register/LoginRegister.js
+++ b/plugins/login-register/LoginRegister.js
@@ -7,7 +7,7 @@
 
 		if (forgotUrl || registerUrl) {
 			addEventListener('rl-view-model', e => {
-				if (e.detail && 'Login' === e.detail.templateId) {
+				if (e.detail && 'Login' === (e.detail.templateId || e.detail.viewModelTemplateID)) {
 					const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
 						forgot = 'LOGIN/LABEL_FORGOT_PASSWORD',
 						register = 'LOGIN/LABEL_REGISTRATION';
diff --git a/plugins/login-register/index.php b/plugins/login-register/index.php
index d7d8f1a98..ff149c791 100644
--- a/plugins/login-register/index.php
+++ b/plugins/login-register/index.php
@@ -4,8 +4,8 @@ class LoginRegisterPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Register and Forgot',
-		VERSION  = '2.0',
-		RELEASE  = '2021-06-01',
+		VERSION  = '2.1',
+		RELEASE  = '2021-10-04',
 		REQUIRED = '2.5.2',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Links on login screen for registration and forgotten password';
diff --git a/plugins/two-factor-auth/index.php b/plugins/two-factor-auth/index.php
index f2ca483e9..9fd5cdd25 100644
--- a/plugins/two-factor-auth/index.php
+++ b/plugins/two-factor-auth/index.php
@@ -6,8 +6,8 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Two Factor Authentication',
-		VERSION  = '2.1',
-		RELEASE  = '2021-07-28',
+		VERSION  = '2.2',
+		RELEASE  = '2021-10-04',
 		REQUIRED = '2.6.0',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Provides support for TOTP 2FA';
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index 3bff11e01..17f1c25aa 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -2,7 +2,7 @@
 (rl => {
 
 	rl && addEventListener('rl-view-model', e => {
-		if (e.detail && 'Login' === e.detail.templateId) {
+		if (e.detail && 'Login' === (e.detail.templateId || e.detail.viewModelTemplateID)) {
 			const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
 				placeholder = 'LOGIN/LABEL_TWO_FACTOR_CODE';
 			if (container) {