diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 77cbcf6ce44..ccc4c3c6f74 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -318,6 +318,10 @@ public abstract class PlayerImpl implements Player, Serializable {
         this.maxHandSize = player.getMaxHandSize();
         this.maxAttackedBy = player.getMaxAttackedBy();
         this.manaPool = player.getManaPool().copy();
+        // Restore user specific settings in case changed since state save
+        this.manaPool.setAutoPayment(this.getUserData().isManaPoolAutomatic());
+        this.manaPool.setAutoPaymentRestricted(this.getUserData().isManaPoolAutomaticRestricted());
+
         this.turns = player.getTurns();
 
         this.range = player.getRange();