diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js
index ae4209ac63..d415a496c9 100644
--- a/binaries/data/mods/public/gui/session/messages.js
+++ b/binaries/data/mods/public/gui/session/messages.js
@@ -436,9 +436,10 @@ var g_NotificationsTypes =
 
 		let cmd = notification.cmd;
 
-		// Ignore boring animals
+		// Ignore rallypoint commands of trained animals
 		let entState = cmd.entities && cmd.entities[0] && GetEntityState(cmd.entities[0]);
-		if (entState && entState.identity && entState.identity.classes &&
+		if (g_ViewedPlayer != 0 &&
+		    entState && entState.identity && entState.identity.classes &&
 		    entState.identity.classes.indexOf("Animal") != -1)
 			return;
 
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 71761491fe..72348db11e 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -663,7 +663,8 @@ function updateTopPanel()
 			});
 	}
 
-	Engine.GetGUIObjectByName("optionFollowPlayer").hidden = !g_IsObserver || !isPlayer;
+	Engine.GetGUIObjectByName("optionFollowPlayer").hidden = !g_IsObserver ||
+		!isPlayer && (g_ViewedPlayer != 0 || g_GameAttributes.settings.Keywords.indexOf("trigger") == -1);
 
 	let viewPlayer = Engine.GetGUIObjectByName("viewPlayer");
 	viewPlayer.hidden = !g_IsObserver && !g_DevSettings.changePerspective;