diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 9c5fabbaf..ccd9ba00c 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -75,9 +75,9 @@ class NewHeader extends Component {
     this.setState({
       user: newProps.user
     })
-    if(!newProps.user ||(newProps.user && !newProps.user.login)){
-      cookie.remove("login");
-    }
+    // if(!newProps.user ||(newProps.user && !newProps.user.login)){
+    //   cookie.remove("login");
+    // }
   }
 
   educoderlogin = () => {
diff --git a/src/forge/Issues/Component/date.jsx b/src/forge/Issues/Component/date.jsx
index f2e0659e4..7df519fd9 100644
--- a/src/forge/Issues/Component/date.jsx
+++ b/src/forge/Issues/Component/date.jsx
@@ -18,10 +18,10 @@ function Date({name , today , setDate , editFlag},ref){
   const refBox = useRef(null);
 
   useEffect(()=>{
-    if(!visible){
+    if(!visible && !editFlag &&time){
       setDate(time);
     }
-  },[visible])
+  },[visible,editFlag,time])
 
 
   useEffect(() => {