diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java
index 51b7ff3..e3c406f 100644
--- a/src/com/sheepit/client/standalone/swing/activity/Settings.java
+++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java
@@ -611,9 +611,9 @@ public class Settings implements Activity {
 				cachePath = config.getStorageDir().getAbsolutePath();
 			}
 			
-			String hostnameText = null;
-			if (hostname.getText() != null && hostname.getText().equals(parent.getConfiguration().getHostname()) == false) {
-				hostnameText = hostname.getText();
+			String hostnameText = hostname.getText();
+			if (hostnameText == null || hostnameText.isEmpty()) {
+				hostnameText = parent.getConfiguration().getHostname();
 			}
 			
 			if (saveFile.isSelected()) {