diff --git a/src/com/sheepit/client/standalone/swing/SettingsLoader.java b/src/com/sheepit/client/standalone/swing/SettingsLoader.java
index dcd6d6e..3e1b33e 100644
--- a/src/com/sheepit/client/standalone/swing/SettingsLoader.java
+++ b/src/com/sheepit/client/standalone/swing/SettingsLoader.java
@@ -177,7 +177,7 @@ public class SettingsLoader {
 			config.setPassword(password);
 		}
 		
-		if (config.getComputeMethod() == null && computeMethod != null) {
+		if ((config.getComputeMethod() == null && computeMethod != null) || (config.getComputeMethod() != ComputeType.valueOf(computeMethod) && computeMethod != null)) {
 			config.setComputeMethod(ComputeType.valueOf(computeMethod));
 		}
 		if (config.getGPUDevice() == null && gpu != null) {