diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index 539e5419..5f804915 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -104,6 +104,8 @@ void MessageLogWidget::logSetCardCounters(QString playerName, QString cardName,
 
 void MessageLogWidget::logSetTapped(QString playerName, QString cardName, bool tapped)
 {
+	if (cardName == "-1")
+		cardName = tr("his permanents");
 	appendAndScroll(tr("%1 %2 %3").arg(playerName).arg(tapped ? "taps" : "untaps").arg(cardName));
 }
 
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index 0dd50c9e..348e2d35 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -123,7 +123,8 @@ void Player::setCardAttrHelper(CardItem *card, const QString &aname, const QStri
 	if (aname == "tapped") {
 		bool tapped = avalue == "1";
 		if (!(!tapped && card->getDoesntUntap() && allCards)) {
-			emit logSetTapped(name, card->getName(), tapped);
+			if (!allCards)
+				emit logSetTapped(name, card->getName(), tapped);
 			card->setTapped(tapped);
 		}
 	} else if (aname == "attacking")
@@ -264,6 +265,8 @@ void Player::gameEvent(const ServerEventData &event)
 				CardList *const cards = zone->getCards();
 				for (int i = 0; i < cards->size(); i++)
 					setCardAttrHelper(cards->at(i), aname, avalue, true);
+				if (aname == "tapped")
+					emit logSetTapped(name, QString("-1"), avalue == "1");
 			} else {
 				CardItem *card = zone->getCard(cardId, "");
 				setCardAttrHelper(card, aname, avalue, false);