diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index ebb099b2e..ff03b11ea 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -362,6 +362,9 @@ class LoginRegisterComponent extends Component {
                     if(weekArray===null){
                         weekArray="/";
                     }
+                    if(weekArray==="null"){
+                        weekArray="/";
+                    }
                     window.location.href = weekArray;
                 }
             }
diff --git a/public/react/src/modules/user/Notcompletedysl.js b/public/react/src/modules/user/Notcompletedysl.js
index 5f180af48..e50d162a6 100644
--- a/public/react/src/modules/user/Notcompletedysl.js
+++ b/public/react/src/modules/user/Notcompletedysl.js
@@ -40,6 +40,9 @@ class Notcompletedysl extends Component {
 		if(weekArray===null){
 			weekArray="/";
 		}
+		if(weekArray==="null"){
+			weekArray="/";
+		}
 		window.location.href = weekArray;
 	}