diff --git a/cockatrice/src/dialogs/dlg_create_token.cpp b/cockatrice/src/dialogs/dlg_create_token.cpp
index 904f70ad2..14adaa48a 100644
--- a/cockatrice/src/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/dialogs/dlg_create_token.cpp
@@ -63,7 +63,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     destroyCheckBox = new QCheckBox(tr("&Destroy token when it leaves the table"));
     destroyCheckBox->setChecked(true);
 
-    faceDownCheckBox = new QCheckBox(tr("Create face-down token"));
+    faceDownCheckBox = new QCheckBox(tr("Create face-down (Only hides name)"));
     connect(faceDownCheckBox, &QCheckBox::toggled, this, &DlgCreateToken::faceDownCheckBoxToggled);
 
     QGridLayout *grid = new QGridLayout;
@@ -167,9 +167,6 @@ void DlgCreateToken::faceDownCheckBoxToggled(bool checked)
         ptEdit->clear();
         ptEdit->clearFocus();
         ptEdit->setEnabled(false);
-        annotationEdit->clear();
-        annotationEdit->clearFocus();
-        annotationEdit->setEnabled(false);
     } else {
         colorEdit->setEnabled(true);
         ptEdit->setEnabled(true);
diff --git a/common/server_player.cpp b/common/server_player.cpp
index 65f42d0b9..01f6947fa 100644
--- a/common/server_player.cpp
+++ b/common/server_player.cpp
@@ -1519,8 +1519,8 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
     if (!cmd.face_down()) {
         card->setColor(nameFromStdString(cmd.color()));
         card->setPT(nameFromStdString(cmd.pt()));
-        card->setAnnotation(nameFromStdString(cmd.annotation()));
     }
+    card->setAnnotation(nameFromStdString(cmd.annotation()));
     card->setDestroyOnZoneChange(cmd.destroy_on_zone_change());
     card->setFaceDown(cmd.face_down());