diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index fb1db5b74d1..5ee2c44fd99 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -251,7 +251,7 @@ public class User {
 
     public boolean isExpired(Date expired) {
         if (lastActivity.before(expired)) {
-            logger.debug(new StringBuilder(userName).append(" is expired!"));
+            logger.debug(userName + " is expired!");
             return true;
         }
         logger.trace(new StringBuilder("isExpired: User ").append(userName).append(" lastActivity: ").append(lastActivity).append(" expired: ").append(expired).toString());
diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/mage/game/match/MatchImpl.java
index b5f332449aa..a212bc22fec 100644
--- a/Mage/src/mage/game/match/MatchImpl.java
+++ b/Mage/src/mage/game/match/MatchImpl.java
@@ -93,13 +93,14 @@ public abstract class MatchImpl implements Match {
     public boolean leave(UUID playerId) {
         MatchPlayer mPlayer = getPlayer(playerId);
         if (mPlayer != null) {
-            if (games.isEmpty() ) {
+            if (startedGames == 0) {
                 return players.remove(mPlayer);
             }
             mPlayer.setQuit(true);
             synchronized (this) {
                 this.notifyAll();
             }
+            checkIfMatchEnds();
             return true;
         }
         return false;