diff --git a/public/src/app.js b/public/src/app.js
index c71f650777..6dfb235cd3 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -5,7 +5,8 @@ var socket,
 
 
 (function() {
-	
+	var showWelcomeMessage = false;
+
 	function loadConfig() {
 	
 		$.ajax({
@@ -285,8 +286,9 @@ var socket,
 				timeout: 5000
 			});
 		}
-
-		if(location.href.indexOf('loggedin') !== -1) {
+		
+		if(showWelcomeMessage) {
+			showWelcomeMessage = false;
 			if(document.readyState !== 'complete') {
 				$(document).ready(showAlert);
 			} else {
@@ -371,6 +373,8 @@ var socket,
 		})
 	});
 
+	showWelcomeMessage = location.href.indexOf('loggedin') !== -1;
+
 	loadConfig();