diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java
index cc5d3ad..1c0cacc 100644
--- a/src/com/sheepit/client/Server.java
+++ b/src/com/sheepit/client/Server.java
@@ -190,13 +190,13 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
 				"/server/config.php",
 				URLEncoder.encode(this.user_config.login(), "UTF-8"),
 				URLEncoder.encode(this.user_config.password(), "UTF-8"),
-				os.getCPU().family(),
-				os.getCPU().model(),
+				URLEncoder.encode(os.getCPU().family(), "UTF-8"),
+				URLEncoder.encode(os.getCPU().model(), "UTF-8"),
 				URLEncoder.encode(os.getCPU().name(), "UTF-8"),
 				((this.user_config.getNbCores() == -1) ? os.getCPU().cores() : this.user_config.getNbCores()),
-				os.name(),
+				URLEncoder.encode(os.name(), "UTF-8"),
 				os.getMemory(),
-				os.getCPU().arch(),
+				URLEncoder.encode(os.getCPU().arch(), "UTF-8"),
 				this.user_config.getJarVersion(),
 				URLEncoder.encode(hostname, "UTF-8"),
 				this.user_config.getExtras());