diff --git a/src/components/LoginSystem.vue b/src/components/LoginSystem.vue
index 61f6068d606eb97fb6932f0b05630040e5a80307..1149de2aa930a5734e6dbff0c344ed2ed5ba53d1 100644
--- a/src/components/LoginSystem.vue
+++ b/src/components/LoginSystem.vue
@@ -170,6 +170,7 @@
 			},
 			/** Login process . sending user credential */
 			handleLogin() {
+				this.showForgottenPasswordSubmitSuccessMsg = false;
 				let This = this;
 
 				this.$root.sharedState.uuid = '';
@@ -263,6 +264,7 @@
 				}
 			},
 			handleLogout() {
+				this.showForgottenPasswordSubmitSuccessMsg = false;
 				this.$root.sharedState.uuid = '';                           // remove global uuid for other (e.g. menu items etc)
 				/** Remove stored data from app in local system - server data still preserve */
 				this.removeStoredData();