diff --git a/CoderClient.iml b/CoderClient.iml
new file mode 100644
index 0000000..b7733fa
--- /dev/null
+++ b/CoderClient.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Zutil" />
+    <orderEntry type="module" module-name="CoderServer" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/com/coder/client/LoginDialog.java b/src/com/coder/client/LoginDialog.java
index a7f0a45..56b7fbf 100644
--- a/src/com/coder/client/LoginDialog.java
+++ b/src/com/coder/client/LoginDialog.java
@@ -139,7 +139,7 @@ public class LoginDialog extends JDialog {
         pack();
         
         //move focus to the password field if already a username has been defined. must be done after pack()
-        if(username.isEmpty() == false){
+        if(username != null && username.isEmpty() == false){
         	passwordPasswordField.requestFocusInWindow();
         }