diff --git a/src/services/nav.js b/src/services/nav.js
index 9bd518d..1f12455 100644
--- a/src/services/nav.js
+++ b/src/services/nav.js
@@ -12,6 +12,8 @@ const loginInterrupt = function(current_url, message) {
     if(!current_url.includes("gate/sign-in"))
     sessionStorage.crinterrupted_page = current_url;
     sessionStorage.crinterrupt_message = message;
+
+    if(!current_url.includes("gate/sign-in"))
     window.location.href = loginUrl;
 }
 
diff --git a/src/stores/gate/auth.module.js b/src/stores/gate/auth.module.js
index f67507a..940d91c 100644
--- a/src/stores/gate/auth.module.js
+++ b/src/stores/gate/auth.module.js
@@ -66,8 +66,11 @@ export const auth = {
         },
         login: async({ commit, state, dispatch }) => {
             try {
+                /* eslint-disable */
+
                 commit('inProgress', true);
                 const token = await doLogin(state.one);
+                
                 if (token) {
                     commit('loginSuccess', {token:token,logged:state.one.logged});
                     dispatch('userCartProduct/checkUserToken', {}, { root: true });
@@ -80,6 +83,11 @@ export const auth = {
                         redirectToInterruptedPage();
                     return true;
                 }
+                else{
+                    commit('loginFailure', "Email id or password is incorrect");                    
+                    commit('inProgress', false);
+                }
+                
             } catch (err) {
                 commit('inProgress', false);
                 commit('prepareWithMessage');