diff --git a/app/ui-master/client/main.js b/app/ui-master/client/main.js
index df70c02c0c5ee..92ba9766cc436 100644
--- a/app/ui-master/client/main.js
+++ b/app/ui-master/client/main.js
@@ -30,7 +30,7 @@ function customScriptsOnLogout() {
 	}
 }
 
-createTemplateForComponent('accountSecurity', () => import('../../../client/account/security/AccountSecurityPage'));
+createTemplateForComponent('accountSecurity', () => import('../../../client/views/account/security/AccountSecurityPage'));
 
 callbacks.add('afterLogoutCleanUp', () => customScriptsOnLogout(), callbacks.priority.LOW, 'custom-script-on-logout');
 
@@ -192,7 +192,7 @@ Template.main.helpers({
 		const user = Meteor.user();
 
 		// User is already using 2fa
-		if (!user || (user.services.totp !== undefined && user.services.totp.enabled)) {
+		if (!user || (user.services.totp !== undefined && user.services.totp.enabled) || (user.services.email2fa !== undefined && user.services.email2fa.enabled)) {
 			return false;
 		}