diff --git a/web/.env.development b/web/.env.development
index faabb044c..dc50b8c79 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -1,2 +1,4 @@
 HOST=authelia-frontend
-PUBLIC_URL=""
\ No newline at end of file
+PUBLIC_URL=""
+REACT_APP_REMEMBER_ME=true
+REACT_APP_RESET_PASSWORD=true
\ No newline at end of file
diff --git a/web/.env.production b/web/.env.production
index 206b820f5..1f6321076 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -1 +1,3 @@
-PUBLIC_URL={{.Base}}
\ No newline at end of file
+PUBLIC_URL={{.Base}}
+REACT_APP_REMEMBER_ME={{.RememberMe}}
+REACT_APP_RESET_PASSWORD={{.ResetPassword}}
\ No newline at end of file
diff --git a/web/public/index.html b/web/public/index.html
index 4ae162c2b..16a5d184e 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -25,7 +25,7 @@
   <title>Login - Authelia</title>
 </head>
 
-<body data-basepath="%PUBLIC_URL%" data-rememberme="{{.RememberMe}}" data-disable-resetpassword="{{.ResetPassword}}">
+<body data-basepath="%PUBLIC_URL%" data-rememberme="%REACT_APP_REMEMBER_ME%" data-resetpassword="%REACT_APP_RESET_PASSWORD%">
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
   <!--
diff --git a/web/src/setupTests.js b/web/src/setupTests.js
index abc9fa374..21fc6bb60 100644
--- a/web/src/setupTests.js
+++ b/web/src/setupTests.js
@@ -1,6 +1,6 @@
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 document.body.setAttribute("data-basepath", "");
-document.body.setAttribute("data-rememberme", "false");
-document.body.setAttribute("data-disable-resetpassword", "false");
+document.body.setAttribute("data-rememberme", "true");
+document.body.setAttribute("data-resetpassword", "true");
 configure({ adapter: new Adapter() });
diff --git a/web/src/utils/Configuration.ts b/web/src/utils/Configuration.ts
index 61249a9a2..e8d42946d 100644
--- a/web/src/utils/Configuration.ts
+++ b/web/src/utils/Configuration.ts
@@ -12,5 +12,5 @@ export function getRememberMe() {
 }
 
 export function getResetPassword() {
-  return getEmbeddedVariable("disable-resetpassword") === "true";
+  return getEmbeddedVariable("resetpassword") === "true";
 }
\ No newline at end of file
