diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php
index 269990a54..f5a83a91a 100644
--- a/Zotlabs/Module/Login.php
+++ b/Zotlabs/Module/Login.php
@@ -5,10 +5,17 @@ namespace Zotlabs\Module;
 class Login extends \Zotlabs\Web\Controller {
 
 	function get() {
-		if(local_channel())
+		if (local_channel()) {
 			goaway(z_root());
-		if(remote_channel() && $_SESSION['atoken'])
+		}
+
+		if (remote_channel() && $_SESSION['atoken']) {
 			goaway(z_root());
+		}
+
+		if (!empty($_GET['retry'])) {
+			notice( t('Login failed.') . EOL );
+		}
 
 		$o = '<div class="generic-content-wrapper">';
 		$o .= '<div class="section-title-wrapper">';
diff --git a/include/auth.php b/include/auth.php
index 439f064e4..36a9043ce 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -353,9 +353,6 @@ else {
 		elseif($atoken) {
 			atoken_login($atoken);
 		}
-		else {
-			notice( t('Failed authentication') . EOL);
-		}
 
 		if(! ($account || $atoken)) {
 			$error = 'authenticate: failed login attempt: ' . notags(trim($username)) . ' from IP ' . $_SERVER['REMOTE_ADDR'];
@@ -364,8 +361,8 @@ else {
 			$authlog = Config::Get('system', 'authlog');
 			if ($authlog)
 				@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
-			notice( t('Login failed.') . EOL );
-			goaway(z_root() . '/login');
+
+			goaway(z_root() . '/login?retry=1');
 		}
 
 		// If the user specified to remember the authentication, then change the cookie
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 113660c7e..be66c00d4 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -88,6 +88,7 @@
 		}
 		else {
 			if (!document.hidden) {
+				sse_fallback();
 				sse_fallback_interval = setInterval(sse_fallback, updateInterval);
 			}