diff --git a/core/acs_parser.js b/core/acs_parser.js
index 3763c8e7..f903d6f1 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -994,8 +994,8 @@ function peg$parse(input, options) {
   						return false;
   					}
   					switch(value) {
-  						case 1 : return user.authFactor >= User.AuthFactors.Factor1;
-  						case 2 : return user.authFactor >= User.AuthFActors.Factor2;
+  						case 1 : return true;
+  						case 2 : return user.getProperty(UserProps.AuthFactor2OTP) ? true : false;
   						default : return false;
   					}
   				},
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index 060344a8..25e5853a 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -150,8 +150,8 @@
 						return false;
 					}
 					switch(value) {
-						case 1 : return user.authFactor >= User.AuthFactors.Factor1;
-						case 2 : return user.authFactor >= User.AuthFActors.Factor2;
+						case 1 : return true;
+						case 2 : return user.getProperty(UserProps.AuthFactor2OTP) ? true : false;
 						default : return false;
 					}
 				},