Merged with #3392

src/components/Login/Login.js

@@ -8,7 +8,7 @@ import {
   fetchLogin,
 } from "../../store/actions/login/loginActions";
 import { selectLoginError } from "../../store/selectors/loginSelectors";
-import { HOME_PAGE, ADMIN_HOME_PAGE } from "../../constants/pages";
+import { HOME_PAGE, ADMIN_HOME_PAGE, LOGIN_PAGE } from "../../constants/pages";
 import { ReactComponent as Logo } from "../../assets/images/svg/logo-vertical.svg";
 // import { ReactComponent as LogoAdmin } from "../../assets/images/svg/logo-vertical-admin.svg";
 import {
@@ -66,6 +66,12 @@ const Login = (props) => {
   // Api response callback function on error
   const handleApiResponseError = () => {
     setPasswordReseted(true);
+    history.push({
+      pathname: LOGIN_PAGE,
+      state: {
+        from: history.location.pathname,
+      },
+    });
   };
 
   // Checks if form is valid, and send it if it is valid