diff --git a/src/actions/api.js b/src/actions/api.js
index a572583dd..2b2be339c 100644
--- a/src/actions/api.js
+++ b/src/actions/api.js
@@ -146,10 +146,8 @@ export const onGetPolicy = () => async (dispatch, getState) => {
 
 export const withCsrf = (fn) => (dispatch, getState) => {
   const csrf = sel.csrf(getState());
-  const csrfIsNeeded = sel.getCsrfIsNeeded(getState());
-  if (csrf || csrfIsNeeded) return fn(dispatch, getState, csrf);
+  if (csrf) return fn(dispatch, getState, csrf);
 
-  dispatch(act.CSRF_NEEDED(true));
   return dispatch(requestApiInfo()).then(() =>
     withCsrf(fn)(dispatch, getState)
   );
@@ -256,24 +254,31 @@ export const onSearchUser = (query, isCMS) => (dispatch) => {
 // onLogin handles a user's login. If it is his first login on the app
 // after registering, his key will be saved under his email. If so, it
 // changes the storage key to his uuid.
-export const onLogin = ({ email, password, code }) =>
-  withCsrf(async (dispatch, _, csrf) => {
-    dispatch(act.REQUEST_LOGIN({ email }));
-    try {
-      const response = await api.login(csrf, email, password, code);
-      await dispatch(onRequestMe());
-      dispatch(act.RECEIVE_LOGIN(response));
-      const { userid, username } = response;
-      const keyNeedsReplace = await pki.needStorageKeyReplace(email, username);
-      if (keyNeedsReplace) {
-        pki.replaceStorageKey(keyNeedsReplace, userid);
+export const onLogin =
+  ({ email, password, code }) =>
+  (dispatch, getState) => {
+    dispatch(onRequireCSRF());
+    return withCsrf(async (dispatch, _, csrf) => {
+      dispatch(act.REQUEST_LOGIN({ email }));
+      try {
+        const response = await api.login(csrf, email, password, code);
+        await dispatch(onRequestMe());
+        dispatch(act.RECEIVE_LOGIN(response));
+        const { userid, username } = response;
+        const keyNeedsReplace = await pki.needStorageKeyReplace(
+          email,
+          username
+        );
+        if (keyNeedsReplace) {
+          pki.replaceStorageKey(keyNeedsReplace, userid);
+        }
+        return;
+      } catch (error) {
+        dispatch(act.RECEIVE_LOGIN(null, error));
+        throw error;
       }
-      return;
-    } catch (error) {
-      dispatch(act.RECEIVE_LOGIN(null, error));
-      throw error;
-    }
-  });
+    })(dispatch, getState);
+  };
 
 // handleLogout calls the correct logout handler according to the user
 // selected option between a normal logout or a permanent logout.
@@ -290,6 +295,13 @@ export const handleNormalLogout = () => {
   clearProposalPaymentPollingPointer();
 };
 
+// handleLocalLogout can be used to clean user session on logout
+// without requesting the API
+export const handleLocalLogout = () => (dispatch) => {
+  dispatch(act.RECEIVE_LOGOUT());
+  handleNormalLogout();
+};
+
 // handlePermanentLogout handles the logout procedures while deleting all
 // user related information from the browser storage and cache.
 export const handlePermanentLogout = (userid) =>
@@ -317,6 +329,10 @@ export const onLogout = (isCMS, isPermanent) =>
       });
   });
 
+export const onRequireCSRF = () => (dispatch) => {
+  dispatch(act.CSRF_NEEDED(true));
+};
+
 export const onChangeUsername = (password, newUsername) =>
   withCsrf((dispatch, _, csrf) => {
     dispatch(act.REQUEST_CHANGE_USERNAME());
@@ -1056,6 +1072,7 @@ export const onCommentVote = (
       })
       .catch((error) => {
         dispatch(act.RECEIVE_LIKE_COMMENT(null, error));
+        throw error;
       });
   });
 
diff --git a/src/actions/tests/api.test.js b/src/actions/tests/api.test.js
index b3f6b0df8..db8b6f988 100644
--- a/src/actions/tests/api.test.js
+++ b/src/actions/tests/api.test.js
@@ -363,6 +363,11 @@ describe("test api actions (actions/api.js)", () => {
       api.onLogin,
       [FAKE_USER],
       (e) => [
+        {
+          error: false,
+          payload: true,
+          type: act.CSRF_NEEDED
+        },
         {
           type: act.REQUEST_LOGIN,
           error: false,
@@ -657,8 +662,16 @@ describe("test api actions (actions/api.js)", () => {
     const path = "/api/comments/v1/vote";
     const commentid = 0;
     const up_action = 1;
-    //const down_action = -1;
-    const params = [FAKE_USER.id, FAKE_PROPOSAL_TOKEN, commentid, up_action];
+    const sectionId = "main";
+
+    const params = [
+      FAKE_USER.id,
+      FAKE_PROPOSAL_TOKEN,
+      commentid,
+      up_action,
+      PROPOSAL_STATE_VETTED,
+      sectionId
+    ];
 
     // this needs a custom assertion for success response as the common one
     // doesn't work for this case.
@@ -676,15 +689,20 @@ describe("test api actions (actions/api.js)", () => {
       path,
       api.onCommentVote,
       params,
-      (errorcode) => [
+      (e) => [
         {
           error: false,
-          payload: { commentid, token: FAKE_PROPOSAL_TOKEN, vote: up_action },
+          payload: {
+            commentid,
+            token: FAKE_PROPOSAL_TOKEN,
+            vote: up_action,
+            sectionId
+          },
           type: act.REQUEST_LIKE_COMMENT
         },
         {
           error: true,
-          payload: { errorcode },
+          payload: e,
           type: act.RECEIVE_LIKE_COMMENT
         }
       ],
diff --git a/src/components/CommentForm/CommentForm.jsx b/src/components/CommentForm/CommentForm.jsx
index 67f60daab..8a91f624f 100644
--- a/src/components/CommentForm/CommentForm.jsx
+++ b/src/components/CommentForm/CommentForm.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 import PropTypes from "prop-types";
 import { Formik } from "formik";
 import FormikPersist from "src/components/FormikPersist";
@@ -15,8 +15,9 @@ import {
 import { Row } from "../layout";
 import MarkdownEditor from "src/components/MarkdownEditor";
 import validationSchema from "./validation";
-import { usePolicy } from "src/hooks";
 import useModalContext from "src/hooks/utils/useModalContext";
+import ModalLogin from "src/components/ModalLogin";
+import { usePolicy } from "src/hooks";
 import ModalConfirm from "src/components/ModalConfirm";
 import styles from "./CommentForm.module.css";
 
@@ -32,10 +33,19 @@ const CommentForm = ({
   isAuthorUpdate,
   hasAuthorUpdates
 }) => {
+  const [handleOpenModal, handleCloseModal] = useModalContext();
+
+  const openLoginModal = useCallback(() => {
+    handleOpenModal(ModalLogin, {
+      onLoggedIn: handleCloseModal,
+      onClose: handleCloseModal,
+      title: "Your session has expired. Please log in again"
+    });
+  }, [handleOpenModal, handleCloseModal]);
+
   const {
     policyPi: { namesupportedchars, namelengthmax, namelengthmin }
   } = usePolicy();
-  const [handleOpenModal, handleCloseModal] = useModalContext();
   const smallTablet = useMediaQuery("(max-width: 685px)");
   async function handleSubmit(
     { comment, title },
@@ -68,7 +78,13 @@ const CommentForm = ({
       }
     } catch (e) {
       setSubmitting(false);
-      setFieldError("global", e);
+      // Hardcode the login modal to show up when user session expires
+      // ref: https://github.com/decred/politeiagui/pull/2541#issuecomment-909194251
+      if (e.statusCode === 403) {
+        openLoginModal();
+      } else {
+        setFieldError("global", e);
+      }
     }
   }
   return (
@@ -156,6 +172,7 @@ will only be able to reply to your most recent update thread.">
               )}
               <Button
                 type="submit"
+                data-testid="comment-submit-button"
                 kind={!isValid || disableSubmit ? "disabled" : "primary"}
                 loading={isSubmitting}>
                 Add comment
diff --git a/src/components/ModalLogin.jsx b/src/components/ModalLogin.jsx
index 9f2fd80e5..080a7cc63 100644
--- a/src/components/ModalLogin.jsx
+++ b/src/components/ModalLogin.jsx
@@ -10,6 +10,7 @@ const ModalLogin = ({ title = "Login", onLoggedIn, onClose, ...props }) => {
       title={title}
       onClose={onClose}
       iconType="info"
+      data-testid="modal-login"
       iconSize="lg"
       {...props}
       contentStyle={{ width: "100%" }}
diff --git a/src/components/ModalProvider.jsx b/src/components/ModalProvider.jsx
index 6c381adef..89a99ac2b 100644
--- a/src/components/ModalProvider.jsx
+++ b/src/components/ModalProvider.jsx
@@ -1,4 +1,5 @@
 import React, { useState, createContext } from "react";
+import isEmpty from "lodash/fp/isEmpty";
 
 export const modalContext = createContext({ component: () => null, props: {} });
 
@@ -10,29 +11,36 @@ const initialState = {
 };
 
 const ModalProvider = ({ children }) => {
-  const [modal, setModal] = useState(initialState);
-  const handleOpenModal = function handleOpenModal(modal, props = {}) {
-    setModal({
-      component: modal,
-      props: {
-        show: true,
-        ...props
-      }
-    });
+  const [modalStack] = useState([]);
+  const [currentModal, setModal] = useState(initialState);
+  const handleOpenModal = function handleOpenModal(
+    modal,
+    props = {},
+    { overlay } = {}
+  ) {
+    const newModal = { component: modal, props: { show: true, ...props } };
+    if (isEmpty(modalStack) || overlay) {
+      modalStack.push(newModal);
+      setModal(newModal);
+    } else if (!currentModal || !currentModal.props.show) {
+      setModal(newModal);
+    }
   };
 
   const handleCloseModal = function handleCloseModal() {
-    setModal(initialState);
+    modalStack.pop();
+    const previousModal = modalStack.pop();
+    setModal(previousModal || initialState);
   };
 
   const props = {
     onClose: handleCloseModal,
-    ...modal.props
+    ...currentModal.props
   };
   return (
     <modalContext.Provider value={[handleOpenModal, handleCloseModal]}>
       {children}
-      <modal.component {...props} />
+      <currentModal.component {...props} />
     </modalContext.Provider>
   );
 };
diff --git a/src/components/ProposalForm/ProposalForm.jsx b/src/components/ProposalForm/ProposalForm.jsx
index 0c4dd65dd..ca338cc4a 100644
--- a/src/components/ProposalForm/ProposalForm.jsx
+++ b/src/components/ProposalForm/ProposalForm.jsx
@@ -20,6 +20,7 @@ import SelectField from "src/components/Select/SelectField";
 import styles from "./ProposalForm.module.css";
 import MarkdownEditor from "src/components/MarkdownEditor";
 import ModalMDGuide from "src/components/ModalMDGuide";
+import ModalLogin from "src/components/ModalLogin";
 import ThumbnailGrid from "src/components/Files";
 import AttachFileInput from "src/components/AttachFileInput";
 import DraftSaver from "./DraftSaver";
@@ -420,6 +421,13 @@ const ProposalFormWrapper = ({
       onClose: handleCloseModal
     });
   }, [handleCloseModal, handleOpenModal]);
+  const openLoginModal = useCallback(() => {
+    handleOpenModal(ModalLogin, {
+      onLoggedIn: handleCloseModal,
+      onClose: handleCloseModal,
+      title: "Your session has expired. Please log in again"
+    });
+  }, [handleOpenModal, handleCloseModal]);
   const [submitSuccess, setSubmitSuccess] = useState(false);
   const { proposalFormValidation, onFetchProposalsBatchWithoutState } =
     useProposalForm();
@@ -482,10 +490,22 @@ const ProposalFormWrapper = ({
         resetForm();
       } catch (e) {
         setSubmitting(false);
-        setFieldError("global", e);
+        // Hardcode the login modal to show up when user session expires
+        // ref: https://github.com/decred/politeiagui/pull/2541#issuecomment-909194251
+        if (e.statusCode === 403) {
+          openLoginModal();
+        } else {
+          setFieldError("global", e);
+        }
       }
     },
-    [history, onSubmit, onFetchProposalsBatchWithoutState, isPublic]
+    [
+      history,
+      onSubmit,
+      onFetchProposalsBatchWithoutState,
+      isPublic,
+      openLoginModal
+    ]
   );
 
   const newInitialValues = initialValues
diff --git a/src/containers/User/Login/Form.jsx b/src/containers/User/Login/Form.jsx
index 1191f33bd..bd8b6181b 100644
--- a/src/containers/User/Login/Form.jsx
+++ b/src/containers/User/Login/Form.jsx
@@ -37,10 +37,14 @@ const LoginForm = ({
     } catch (e) {
       setSubmitting(false);
       if (e.errorcode === TOTP_MISSING_LOGIN_ERROR) {
-        handleOpenModal(ModalTotpVerify, {
-          onVerify: (code) => onLogin({ ...credentials, code }),
-          onClose: handleCloseModal
-        });
+        handleOpenModal(
+          ModalTotpVerify,
+          {
+            onVerify: (code) => onLogin({ ...credentials, code }),
+            onClose: handleCloseModal
+          },
+          { overlay: true }
+        );
         return;
       }
       setFieldError("global", e);
diff --git a/src/containers/User/SessionChecker/SessionChecker.jsx b/src/containers/User/SessionChecker/SessionChecker.jsx
index b5511049d..09bf4293d 100644
--- a/src/containers/User/SessionChecker/SessionChecker.jsx
+++ b/src/containers/User/SessionChecker/SessionChecker.jsx
@@ -1,42 +1,47 @@
 import PropTypes from "prop-types";
 import { useEffect, useCallback } from "react";
 import { useSessionChecker } from "./hooks";
-import useNavigation from "src/hooks/api/useNavigation";
 import ModalLogin from "src/components/ModalLogin";
 import useModalContext from "src/hooks/utils/useModalContext";
 
 const LOGIN_MODAL_ID = "sessionExpiredModal";
 
-const SessionChecker = ({ children }) => {
-  const { sessionExpired, setSessionExpired } = useSessionChecker();
-  const { handleLogout } = useNavigation();
+const SessionChecker = ({ children, showModal }) => {
+  const { sessionExpired, setSessionExpired, handleLogout } =
+    useSessionChecker();
   const [handleOpenModal, handleCloseModal] = useModalContext();
 
-  const markSessionExpiredAsFalse = useCallback(() => {
-    setSessionExpired(false);
-  }, [setSessionExpired]);
-
   const closeModal = useCallback(() => {
     handleLogout();
     handleCloseModal();
-    markSessionExpiredAsFalse();
-  }, [handleCloseModal, handleLogout, markSessionExpiredAsFalse]);
+    setSessionExpired(false);
+  }, [handleCloseModal, handleLogout, setSessionExpired]);
+
+  const openModal = useCallback(() => {
+    handleOpenModal(ModalLogin, {
+      onLoggedIn: () => {
+        setSessionExpired(false);
+        handleCloseModal();
+      },
+      id: LOGIN_MODAL_ID,
+      title: "Your session has expired. Please log in again",
+      onClose: closeModal,
+      disableDismiss: true
+    });
+  }, [setSessionExpired, handleOpenModal, closeModal, handleCloseModal]);
 
   useEffect(() => {
-    if (sessionExpired) {
-      handleOpenModal(ModalLogin, {
-        onLoggedIn: markSessionExpiredAsFalse,
-        id: LOGIN_MODAL_ID,
-        title: "Your session has expired. Please log in again",
-        onClose: closeModal
-      });
+    if (sessionExpired && showModal) {
+      openModal();
     }
-  }, [sessionExpired, markSessionExpiredAsFalse, handleOpenModal, closeModal]);
+  }, [sessionExpired, openModal, showModal]);
+
   return children;
 };
 
 SessionChecker.propTypes = {
-  children: PropTypes.node.isRequired
+  children: PropTypes.node.isRequired,
+  showModal: PropTypes.bool
 };
 
 export default SessionChecker;
diff --git a/src/containers/User/SessionChecker/hooks.js b/src/containers/User/SessionChecker/hooks.js
index 526e910e9..9fe624693 100644
--- a/src/containers/User/SessionChecker/hooks.js
+++ b/src/containers/User/SessionChecker/hooks.js
@@ -1,22 +1,35 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useCallback, useMemo } from "react";
 import * as sel from "src/selectors";
-import { useSelector } from "src/redux";
+import * as act from "src/actions";
+import { useSelector, useAction } from "src/redux";
 
 export function useSessionChecker() {
   const currentUser = useSelector(sel.currentUser);
-  const [sessionExpired, setSessionExpired] = useState(false);
+  const handleLogout = useAction(act.handleLocalLogout);
+  const [sessionExpired, setSessionExpired] = useState();
+  const timeout = useMemo(() => {
+    if (!currentUser) return;
+    const { sessionmaxage, lastlogintime } = currentUser;
+    return sessionmaxage * 1000 - (Date.now() / 1000 - lastlogintime);
+  }, [currentUser]);
 
   const checkUserSession = useCallback(() => {
-    if (currentUser && !sessionExpired) {
-      const { sessionmaxage, lastlogintime } = currentUser;
-      const expired = sessionmaxage < Date.now() / 1000 - lastlogintime;
-      setSessionExpired(expired);
-    }
-  }, [currentUser, sessionExpired]);
+    const { sessionmaxage, lastlogintime } = currentUser;
+    const expired = sessionmaxage < Date.now() / 1000 - lastlogintime;
+    setSessionExpired(expired);
+  }, [currentUser]);
 
   useEffect(() => {
-    checkUserSession();
-  });
+    let interval;
+    if (timeout) {
+      interval = setInterval(() => {
+        checkUserSession();
+      }, timeout);
+    }
+    return () => {
+      interval && clearInterval(interval);
+    };
+  }, [timeout, checkUserSession]);
 
-  return { sessionExpired, setSessionExpired };
+  return { sessionExpired, setSessionExpired, handleLogout };
 }
diff --git a/src/hooks/api/useComments.js b/src/hooks/api/useComments.js
index 93d1456a9..180c4db9b 100644
--- a/src/hooks/api/useComments.js
+++ b/src/hooks/api/useComments.js
@@ -6,6 +6,8 @@ import * as act from "src/actions";
 import { useSelector, useAction } from "src/redux";
 import { useLoaderContext } from "src/containers/Loader";
 import { PROPOSAL_STATE_VETTED } from "src/constants";
+import ModalLogin from "src/components/ModalLogin";
+import useModalContext from "src/hooks/utils/useModalContext";
 
 export default function useComments(
   recordToken,
@@ -15,6 +17,7 @@ export default function useComments(
 ) {
   const isSingleThread = !!threadParentID;
   const { enableCommentVote, recordType, constants } = useConfig();
+  const [handleOpenModal, handleCloseModal] = useModalContext();
 
   const errorSelector = or(
     sel.apiProposalCommentsError,
@@ -110,6 +113,14 @@ export default function useComments(
     [onFetchLikes, needsToFetchCommentsLikes, recordToken, userid]
   );
 
+  const openLoginModal = useCallback(() => {
+    handleOpenModal(ModalLogin, {
+      onLoggedIn: handleCloseModal,
+      onClose: handleCloseModal,
+      title: "Your session has expired. Please log in again"
+    });
+  }, [handleOpenModal, handleCloseModal]);
+
   const onCommentVote = useCallback(
     (commentID, action, token) => {
       onCommentVoteAction(
@@ -119,9 +130,13 @@ export default function useComments(
         action,
         proposalState,
         sectionId
-      );
+      ).catch((e) => {
+        if (e.statusCode === 403) {
+          openLoginModal();
+        }
+      });
     },
-    [onCommentVoteAction, userid, proposalState, sectionId]
+    [onCommentVoteAction, userid, proposalState, sectionId, openLoginModal]
   );
 
   const getCommentLikeOption = useCallback(
diff --git a/src/hooks/api/useNavigation.js b/src/hooks/api/useNavigation.js
index c6ad6610d..406e3f936 100644
--- a/src/hooks/api/useNavigation.js
+++ b/src/hooks/api/useNavigation.js
@@ -7,6 +7,5 @@ export default function useNavigation() {
   const isCMS = useSelector(sel.isCMS);
   const username = user && user.username;
   const onLogout = useAction(act.onLogout);
-  const handleLogout = useAction(act.handleLogout);
-  return { user, username, onLogout, handleLogout, isCMS };
+  return { user, username, onLogout, isCMS };
 }
diff --git a/src/lib/api.js b/src/lib/api.js
index d547a3578..bb4729f67 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -10,7 +10,7 @@ import {
   PROPOSAL_METADATA_FILENAME,
   VOTE_METADATA_FILENAME
 } from "../constants";
-import { APIUserError, APIPluginError, isAPIWww } from "./errors.js";
+import { APIUserError, APIPluginError } from "./errors.js";
 import {
   digestPayload,
   digest,
@@ -23,7 +23,7 @@ import {
 const STATUS_ERR = {
   400: "Bad response from server",
   401: "Not authorized",
-  403: "Forbidden",
+  403: "You must be logged in to perform this action.",
   404: "Not found"
 };
 
@@ -357,13 +357,8 @@ export const parseResponse = (response) =>
             response: {},
             csrfToken: response.headers.get("X-Csrf-Token")
           });
-        let errorcode = json.errorcode;
-        let errorcontext = json.errorcontext;
-
-        if (isAPIWww(response.url)) {
-          errorcode = json.ErrorCode;
-          errorcontext = json.ErrorContext;
-        }
+        const errorcode = json.errorcode || json.ErrorCode;
+        const errorcontext = json.errorcontext || json.ErrorContext;
 
         if (json.pluginid) {
           reject(new APIPluginError(json.pluginid, errorcode, errorcontext));
diff --git a/src/lib/errors.js b/src/lib/errors.js
index 78a698fef..cdf0254a4 100644
--- a/src/lib/errors.js
+++ b/src/lib/errors.js
@@ -86,7 +86,8 @@ function RecordsUserError(code, context) {
     17: "The record status is invalid",
     18: `The status transition is invalid: ${context}`,
     19: "The status reason was not found",
-    20: "The number of requested record tokens exceeds the page size policy."
+    20: "The number of requested record tokens exceeds the page size policy.",
+    29: "You must be logged in to perform this action"
   };
 
   this.message = errorMap[code] || defaultErrorMessage(code, APIRecords);
@@ -364,10 +365,3 @@ function TicketvotePluginError(code, context) {
 }
 
 TicketvotePluginError.prototype = new Error();
-
-// Helpers
-export function isAPIWww(url) {
-  if (url.startsWith("/api")) return true;
-  const apiType = new URL(url).pathname.split("/")[2];
-  return apiType === APIWww;
-}
diff --git a/src/reducers/app.js b/src/reducers/app.js
index f2f568821..e54838d1f 100644
--- a/src/reducers/app.js
+++ b/src/reducers/app.js
@@ -124,7 +124,10 @@ const app = (state = DEFAULT_STATE, action) =>
         ...state,
         draftDccs: action.payload
       }),
-      [act.CSRF_NEEDED]: () => ({ ...state, csrfIsNeeded: action.payload }),
+      [act.CSRF_NEEDED]: () => ({
+        ...state,
+        init: { ...state.init, csrfToken: null }
+      }),
       [act.SHOULD_AUTO_VERIFY_KEY]: () => ({
         ...state,
         shouldVerifyKey: action.payload
diff --git a/src/reducers/tests/app.test.js b/src/reducers/tests/app.test.js
index dc007da95..e0abf5744 100644
--- a/src/reducers/tests/app.test.js
+++ b/src/reducers/tests/app.test.js
@@ -103,7 +103,6 @@ describe("test app reducer", () => {
   test("correctly test reducers that only sets payload to informed key", () => {
     const reducers = [
       { action: act.LOAD_DRAFT_PROPOSALS, key: "draftProposals" },
-      { action: act.CSRF_NEEDED, key: "csrfIsNeeded" },
       { action: act.SHOULD_AUTO_VERIFY_KEY, key: "shouldVerifyKey" },
       { action: act.IDENTITY_IMPORTED, key: "identityImportResult" },
       {
@@ -121,4 +120,13 @@ describe("test app reducer", () => {
       assertKeyEqualsPayload({}, act, obj.key);
     });
   });
+
+  test("correctly deletes csrf token when required", () => {
+    const action = {
+      type: act.CSRF_NEEDED,
+      payload: { data: "any" },
+      error: false
+    };
+    expect(app({ init: {} }, action)).toEqual({ init: { csrfToken: null } });
+  });
 });
diff --git a/src/selectors/app.js b/src/selectors/app.js
index 8e02f5663..59c6d5e4a 100644
--- a/src/selectors/app.js
+++ b/src/selectors/app.js
@@ -68,9 +68,6 @@ export const resolveEditUserValues = (prefs) => {
   };
 };
 
-export const getCsrfIsNeeded = (state) =>
-  state.app ? state.app.csrfIsNeeded : null;
-
 export const shouldAutoVerifyKey = (state) => state.app.shouldVerifyKey;
 
 export const identityImportSuccess = (state) =>
diff --git a/src/selectors/tests/app.test.js b/src/selectors/tests/app.test.js
index 8053af8a8..4b95aa9da 100644
--- a/src/selectors/tests/app.test.js
+++ b/src/selectors/tests/app.test.js
@@ -8,10 +8,6 @@ describe("test app selector", () => {
     );
   });
 
-  it("test selector getCsrfIsNeeded", () => {
-    expect(sel.getCsrfIsNeeded(MOCK_STATE)).toBeTruthy();
-  });
-
   it("test selector identityImportSuccess", () => {
     expect(sel.identityImportSuccess(MOCK_STATE)).toEqual(
       MOCK_STATE.app.identityImportResult.successMsg
diff --git a/teste2e/cypress/e2e/comments/commentVotes.js b/teste2e/cypress/e2e/comments/commentVotes.js
index bb073dca6..8783fd936 100644
--- a/teste2e/cypress/e2e/comments/commentVotes.js
+++ b/teste2e/cypress/e2e/comments/commentVotes.js
@@ -83,7 +83,6 @@ describe("Comments Votes", () => {
     let token;
     beforeEach(() => {
       cy.middleware("comments.comments", 50);
-      cy.middleware("comments.vote", { isError: true, delay: 3000 });
       cy.intercept("/api/ticketvote/v1/inventory").as("inventory");
       cy.visit("/");
       cy.wait("@inventory").then(
@@ -91,12 +90,22 @@ describe("Comments Votes", () => {
       );
     });
     it("should display error message", () => {
+      cy.middleware("comments.vote", {
+        errorCode: 10,
+        statusCode: 400,
+        delay: 3000
+      });
       cy.visit(`/record/${shortRecordToken(token)}`);
       cy.findByText(/Error/).should("not.exist");
       cy.findAllByTestId("dislike-btn").first().click();
       cy.findByText(/Error/).should("exist");
     });
     it("should reset votes count on error", () => {
+      cy.middleware("comments.vote", {
+        errorCode: 10,
+        statusCode: 400,
+        delay: 3000
+      });
       let upvotes;
       cy.visit(`/record/${shortRecordToken(token)}`);
       cy.findAllByTestId("score-like")
@@ -120,5 +129,12 @@ describe("Comments Votes", () => {
           expect(Number(newup)).to.equal(Number(upvotes));
         });
     });
+    it("should display login modal when voting with an expired user session", () => {
+      cy.middleware("comments.vote", { statusCode: 403 });
+      cy.visit(`/record/${shortRecordToken(token)}`);
+      cy.findAllByTestId("like-btn").first().click();
+      cy.wait(1000);
+      cy.findByTestId("modal-login").should("exist");
+    });
   });
 });
diff --git a/teste2e/cypress/e2e/comments/comments.js b/teste2e/cypress/e2e/comments/comments.js
index b006e74ad..c63d338a4 100644
--- a/teste2e/cypress/e2e/comments/comments.js
+++ b/teste2e/cypress/e2e/comments/comments.js
@@ -95,3 +95,29 @@ describe("User comments", () => {
     );
   });
 });
+
+describe("Failed comments", () => {
+  let token = "";
+  beforeEach(() => {
+    const user = {
+      email: "adminuser@example.com",
+      username: "adminuser",
+      password: "password"
+    };
+    cy.login(user);
+    cy.intercept("/api/ticketvote/v1/inventory").as("inventory");
+    cy.visit("/");
+    cy.wait("@inventory").then(({ response: { body } }) => {
+      token = body.vetted.unauthorized[0];
+    });
+  });
+  it("should display login modal when commenting with an expired user session", () => {
+    cy.middleware("comments.new", { errorCode: 403 });
+    cy.wait(1000);
+    cy.visit(`/record/${shortRecordToken(token)}`);
+    cy.findByTestId(/text-area/i).type("new comment");
+    cy.findByTestId(/comment-submit-button/i).click();
+    cy.wait("@comments.new");
+    cy.findByTestId("modal-login").should("exist");
+  });
+});
diff --git a/teste2e/cypress/support/mock/comments.js b/teste2e/cypress/support/mock/comments.js
index fef8d61de..35f8b7ed5 100644
--- a/teste2e/cypress/support/mock/comments.js
+++ b/teste2e/cypress/support/mock/comments.js
@@ -1,11 +1,13 @@
-import { buildRecord, buildRecordComment } from "../generate";
+import { buildRecordComment } from "../generate";
 import range from "lodash/fp/range";
 import compose from "lodash/fp/compose";
 import map from "lodash/fp/map";
 
+const COMMENTS_API = "/api/comments/v1";
+
 export const middlewares = {
   comments: (amount, state) =>
-    cy.intercept("/api/comments/v1/comments", (req) => {
+    cy.intercept(`${COMMENTS_API}/comments`, (req) => {
       const token = req.body.token;
       const comments = compose(
         map((comment) => ({
@@ -30,12 +32,25 @@ export const middlewares = {
       )(0);
       req.reply({ body: { comments } });
     }),
-  vote: ({ isError, delay = 0 } = {}) =>
-    cy.intercept("/api/comments/v1/vote", (req) => {
+  vote: ({ errorCode, statusCode = 200, delay = 0 } = {}) =>
+    cy.intercept(`${COMMENTS_API}/vote`, (req) => {
+      if (statusCode === 403 && !errorCode) {
+        req.reply({
+          statusCode,
+          delay
+        });
+      } else {
+        req.reply({
+          body: errorCode ? { errorcode: errorCode, pluginid: "comments" } : {},
+          statusCode,
+          delay
+        });
+      }
+    }),
+  new: ({ errorCode } = {}) =>
+    cy.intercept(`${COMMENTS_API}/new`, (req) => {
       req.reply({
-        body: isError ? { errorcode: 10, pluginid: "comments" } : {},
-        statusCode: isError ? 400 : 200,
-        delay: delay
+        statusCode: errorCode || 200
       });
     })
 };