diff --git a/src/chat/ClientWindow.java b/src/chat/ClientWindow.java
index f70ce08..585736c 100644
--- a/src/chat/ClientWindow.java
+++ b/src/chat/ClientWindow.java
@@ -52,6 +52,13 @@ public class ClientWindow implements ActionListener {
                     JOptionPane.PLAIN_MESSAGE);
         	
         	connected = network.connect(username);
+        	if(!connected)
+        	{
+        		if(username.equals(""))
+        			JOptionPane.showMessageDialog(chatWindow, "Please enter a username", "Error", JOptionPane.ERROR_MESSAGE);
+        		else if (username != null)
+        			JOptionPane.showMessageDialog(chatWindow, "This username is already taken", "Error", JOptionPane.ERROR_MESSAGE);
+        	}
         }
 		
         if(username != null)
diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index 3403bb0..d4e4283 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -267,13 +267,13 @@ public class NetworkClient {
             			System.out.println(userList.get(i).getName() + " : " + userList.get(i).getAddress());
                 		known_users.add(userList.get(i));
                 	}
-            		known_users.add(new User(username, "25.68.185.103"));
+            		known_users.add(new User(username, "25.67.234.235"));
             		connected = true;
             	}
             }
           	catch(SocketTimeoutException e)
             {
-        		known_users.add(new User(username, "25.68.185.103"));
+        		known_users.add(new User(username, "25.67.234.235"));
           		System.out.println("Reply timed out");
           		connected = true;
             }