diff --git a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
index a3e49b9c81..1f04a72fd2 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
@@ -494,7 +494,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
     }
 
     public final void init(PlayerView player, BigCard bigCard, UUID gameId, int priorityTime) {
-        this.playerPanel.init(gameId, player.getPlayerId(), bigCard, priorityTime);
+        this.playerPanel.init(gameId, player.getPlayerId(), player.getControlled(), bigCard, priorityTime);
         this.battlefieldPanel.init(gameId, bigCard);
         this.gameId = gameId;
         this.playerId = player.getPlayerId();
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
index 2c713fd410..f66394ce70 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
@@ -86,11 +86,11 @@ public class PlayerPanelExt extends javax.swing.JPanel {
         deadBackgroundColor = currentTheme.getPlayerPanel_deadBackgroundColor();
     }
 
-    public void init(UUID gameId, UUID playerId, BigCard bigCard, int priorityTime) {
+    public void init(UUID gameId, UUID playerId, boolean controlled, BigCard bigCard, int priorityTime) {
         this.gameId = gameId;
         this.playerId = playerId;
         this.bigCard = bigCard;
-        cheat.setVisible(SessionHandler.isTestMode());
+        cheat.setVisible(SessionHandler.isTestMode() && controlled);
         cheat.setFocusable(false);
         flagName = null;
         if (priorityTime > 0) {
diff --git a/Mage.Common/src/main/java/mage/view/PlayerView.java b/Mage.Common/src/main/java/mage/view/PlayerView.java
index 71c2964258..2269530dc6 100644
--- a/Mage.Common/src/main/java/mage/view/PlayerView.java
+++ b/Mage.Common/src/main/java/mage/view/PlayerView.java
@@ -31,6 +31,7 @@ public class PlayerView implements Serializable {
 
     private final UUID playerId;
     private final String name;
+    private final boolean controlled; // gui: player is current user
     private final int life;
     private final Counters counters;
     private final int wins;
@@ -64,6 +65,7 @@ public class PlayerView implements Serializable {
     public PlayerView(Player player, GameState state, Game game, UUID createdForPlayerId, UUID watcherUserId) {
         this.playerId = player.getId();
         this.name = player.getName();
+        this.controlled = player.getId().equals(createdForPlayerId);
         this.life = player.getLife();
         this.counters = player.getCounters();
         this.wins = player.getMatchPlayer().getWins();
@@ -164,6 +166,10 @@ public class PlayerView implements Serializable {
         }
     }
 
+    public boolean getControlled() {
+        return this.controlled;
+    }
+
     public int getLife() {
         return this.life;
     }