diff --git a/src/App.js b/src/App.js
index 3d45a3852..6e983a59d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -108,7 +108,7 @@ const App = () => {
                     <Route exact path="/:lang(en|de|ru)/signin" component={SignIn} />
                     <Route exact path="/:lang(en|de|ru)/signout" component={SignOut} />
                     <Route exact path="/:lang(en|de|ru)/signup" component={SignUp} />
-                    <Route exact path="/:lang(en|de|ru)/forgot-password" component={ForgotPassword} />
+                    <Route exact path="/:lang(en|de|ru)/forgot-password/:token?" component={ForgotPassword} />
                     <Route exact path="/:lang(en|de|ru)/convert/:quote-to-:base" render={props => <Pair {...props} store={store} />} />
                     <Route exact path="/:lang(en|de|ru)/not-found" component={NotFound} />
                     <Route component={NotFoundRedirect} />
diff --git a/src/components/Accounts/ForgotPassword/ForgotPassword.js b/src/components/Accounts/ForgotPassword/ForgotPassword.js
index 741b461a0..d5d131c94 100644
--- a/src/components/Accounts/ForgotPassword/ForgotPassword.js
+++ b/src/components/Accounts/ForgotPassword/ForgotPassword.js
@@ -4,14 +4,10 @@ import Cookies from 'js-cookie';
 import RequestReset from './request';
 import NewPassword from './reset';
 
-const resetToken = Cookies.get('resetToken');
+const resetTokenCookie = Cookies.get('resetToken');
 
-const ForgotPassword = () => {
-  useEffect(() => {
-    return () => {
-      Cookies.remove('resetToken');
-    };
-  }, []);
+const ForgotPassword = (props) => {
+	const resetToken = props.match.params.token || resetTokenCookie;
 
   if (resetToken) return <NewPassword resetToken={resetToken} />;
 
diff --git a/src/css/_general.scss b/src/css/_general.scss
index 87e7ffad3..9efec57fc 100644
--- a/src/css/_general.scss
+++ b/src/css/_general.scss
@@ -1,7 +1,8 @@
 body,
 html {
   height: 100%;
-  background: #fafafa;
+	background: #fafafa;
+	overflow-x: hidden;
 }
 
 #root {