Index: trunk/src/tmcsim/client/cadclientgui/screens/Login.java
===================================================================
--- trunk/src/tmcsim/client/cadclientgui/screens/Login.java	(revision 59)
+++ trunk/src/tmcsim/client/cadclientgui/screens/Login.java	(revision 289)
@@ -7,4 +7,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -24,5 +26,5 @@
  * @author Vincent
  */
-public class Login extends JFrame
+public class Login extends JFrame implements KeyListener
 {
     private Box login;
@@ -125,7 +127,7 @@
 
         Box leftBox = new Box(BoxLayout.Y_AXIS);
-        leftBox.setMaximumSize(new Dimension(350, 50));
-        leftBox.setMinimumSize(new Dimension(350, 50));
-        leftBox.setPreferredSize(new Dimension(350, 50));
+        leftBox.setMaximumSize(new Dimension(350, 90));
+        leftBox.setMinimumSize(new Dimension(350, 90));
+        leftBox.setPreferredSize(new Dimension(350, 90));
         leftBox.setAlignmentX(LEFT_ALIGNMENT);
 
@@ -133,4 +135,6 @@
         userNameLabel.setForeground(Color.WHITE);
         userNameField = new JTextField(kNamePrompt);
+        userNameField.addKeyListener(this);
+        userNameField.setForeground(Color.GRAY);
         Box userNameBox = new Box(BoxLayout.X_AXIS);
         userNameBox.setAlignmentX(LEFT_ALIGNMENT);
@@ -143,4 +147,5 @@
         passwordLabel.setForeground(Color.WHITE);
         passwordField = new JTextField("Not required");
+        passwordField.setEnabled(false);
         Box passwordBox = new Box(BoxLayout.X_AXIS);
         passwordBox.setAlignmentX(LEFT_ALIGNMENT);
@@ -207,3 +212,25 @@
         setVisible(true);
     }
+
+    /** 
+     * This keylistener removes the prompt displayed in the username text box
+     * the first time the user presses a key.  Fixes #96
+     * @author jdalbey
+     * @param evt 
+     */
+    public void keyPressed(KeyEvent evt) 
+    {
+        // See if the text in the box is the initial prompt
+        // If so, the user hasn't typed anything yet, this is the 1st keypress
+        // Even the shift key will be caught here.
+        if (userNameField.getText().equals(kNamePrompt))
+        {
+            userNameField.setText("");
+            // Change the text color from gray to black
+            userNameField.setForeground(Color.BLACK);
+        }
+    }
+
+    public void keyReleased(KeyEvent e) {}
+    public void keyTyped(KeyEvent e) {}
 }