diff --git a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
index 5394c5640aa..eae1b08bb81 100644
--- a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
@@ -1,10 +1,3 @@
-
-
- /*
- * NewPlayerPanel.java
- *
- * Created on 15-Dec-2009, 10:09:46 PM
- */
 package mage.client.table;
 
 import java.io.File;
diff --git a/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
index 2ced51179f7..3a7a6dd8f38 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
@@ -126,7 +126,7 @@ public class TablePlayerPanel extends javax.swing.JPanel {
     private void cbPlayerTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbPlayerTypeActionPerformed
         if (getPlayerType() != PlayerType.HUMAN) {
             this.newPlayerPanel.setVisible(true);
-            this.newPlayerPanel.setPlayerName("Computer " + this.lblPlayerNum.getText().charAt(this.lblPlayerNum.getText().length() - 1));
+            this.newPlayerPanel.setPlayerName(ClientDefaultSettings.computerName + " " + this.lblPlayerNum.getText().charAt(this.lblPlayerNum.getText().length() - 1));
         } 
         else {
             this.newPlayerPanel.setVisible(false);
diff --git a/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java
index 33e462727d4..a7e2d7b4e28 100644
--- a/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java
@@ -10,6 +10,7 @@ package mage.client.table;
 
 import mage.cards.decks.DeckCardLists;
 import mage.client.SessionHandler;
+import mage.client.util.ClientDefaultSettings;
 import mage.players.PlayerType;
 
 import javax.swing.*;
@@ -136,9 +137,9 @@ public class TournamentPlayerPanel extends javax.swing.JPanel {
     private void cbPlayerTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbPlayerTypeActionPerformed
         if (this.cbPlayerType.getSelectedItem() != PlayerType.HUMAN) {
             this.pnlPlayerName.setVisible(true);
-            if (this.txtPlayerName.getText().isEmpty()) {
-                this.txtPlayerName.setText("Computer " + this.lblPlayerNum.getText());
-            }
+            this.txtPlayerName.setText(ClientDefaultSettings.computerName + " " + this.lblPlayerNum.getText().charAt(this.lblPlayerNum.getText().length() - 1));
+            this.txtPlayerName.setEditable(false);
+            this.txtPlayerName.setEnabled(false);
         } else {
             this.pnlPlayerName.setVisible(false);
         }
diff --git a/Mage.Client/src/main/java/mage/client/util/ClientDefaultSettings.java b/Mage.Client/src/main/java/mage/client/util/ClientDefaultSettings.java
index 7d4d5295166..528e2b85b4c 100644
--- a/Mage.Client/src/main/java/mage/client/util/ClientDefaultSettings.java
+++ b/Mage.Client/src/main/java/mage/client/util/ClientDefaultSettings.java
@@ -28,7 +28,7 @@ public final class ClientDefaultSettings {
         handScalingFactor = 1.3;
         deckPath = "";
         otherPlayerIndex = "1";  // combobox default, example: 0: Human, 1: Computer - mad, 2: Computer - Draft Bot
-        computerName = "computer";
+        computerName = "Computer";
         dimensions = new CardDimensions(cardScalingFactor);
         dimensionsEnlarged = new CardDimensions(cardScalingFactorEnlarged);
     }