diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
index 010071255ab2a0ccdfaba059ba448e10be1b8d3b..daaf7ec01faedded5635541847495e98d907fbab 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
@@ -9,7 +9,6 @@ import org.apache.catalina.webresources.DirResourceSet;
 import org.apache.catalina.webresources.JarResourceSet;
 import org.apache.catalina.webresources.StandardRoot;
 
-
 import java.awt.*;
 import java.io.File;
 import java.net.URI;
diff --git a/jams-server/src/main/java/net/jami/jams/server/update/SFLTrustStore.java b/jams-server/src/main/java/net/jami/jams/server/update/SFLTrustStore.java
index cfd83f4fc1e63efb3e092f38068f3540745bebc7..8726727769689d6b17fc7952eb2662cd299456ce 100644
--- a/jams-server/src/main/java/net/jami/jams/server/update/SFLTrustStore.java
+++ b/jams-server/src/main/java/net/jami/jams/server/update/SFLTrustStore.java
@@ -1,6 +1,5 @@
 package net.jami.jams.server.update;
 
-import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/jams-server/src/main/java/net/jami/jams/server/update/UpdateCheckTask.java b/jams-server/src/main/java/net/jami/jams/server/update/UpdateCheckTask.java
index 419ec9e95a1180738d327546d7a77c7f55c4a001..5c47e9db0bbd23922d24963f6bb3de4f089999e9 100644
--- a/jams-server/src/main/java/net/jami/jams/server/update/UpdateCheckTask.java
+++ b/jams-server/src/main/java/net/jami/jams/server/update/UpdateCheckTask.java
@@ -32,7 +32,7 @@ public class UpdateCheckTask extends TimerTask {
                     responseData.append((char) con.getInputStream().read());
                     currentSize++;
                 }
-                log.info("Response received from update server {} ", responseData.toString());
+                log.info("Response received from update server {} ",con.getResponseCode());
                 //TODO: Populate the files which "need" to be downloaded.
             } else {
                 log.info("An error has occurred while checking for an update: {} ", con.getResponseCode());
diff --git a/jams-server/src/main/java/net/jami/jams/server/update/UpdateDaemon.java b/jams-server/src/main/java/net/jami/jams/server/update/UpdateDaemon.java
index a3a667a554b22d3155550ed2e3a001110abf647b..5353182e014fee9e86457c18785755df3985bf5d 100644
--- a/jams-server/src/main/java/net/jami/jams/server/update/UpdateDaemon.java
+++ b/jams-server/src/main/java/net/jami/jams/server/update/UpdateDaemon.java
@@ -1,12 +1,17 @@
 package net.jami.jams.server.update;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 
+@Getter
+@Setter
 public class UpdateDaemon extends Timer {
 
-    public static final String UPDATE_SERVER_URI = "https://jami.net";
+    public  static final String UPDATE_SERVER_URI = "https://jami.net";
     public static final List<String> updateFiles = new ArrayList<>();
 
     public UpdateDaemon() {
diff --git a/jams-server/src/main/java/net/jami/jams/server/update/UpdateDownloader.java b/jams-server/src/main/java/net/jami/jams/server/update/UpdateDownloader.java
index c2a2589e2ccca14975958138e0a0f88ec2970d5d..1f1e837454c36cfef588f20b6fd52916a3b2b0d8 100644
--- a/jams-server/src/main/java/net/jami/jams/server/update/UpdateDownloader.java
+++ b/jams-server/src/main/java/net/jami/jams/server/update/UpdateDownloader.java
@@ -2,19 +2,28 @@ package net.jami.jams.server.update;
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.net.ssl.*;
-import java.io.FileOutputStream;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
 import java.net.URL;
 import java.security.KeyStore;
 
 import static net.jami.jams.server.update.UpdateDaemon.UPDATE_SERVER_URI;
+import static net.jami.jams.server.update.UpdateDaemon.updateFiles;
 
 @Slf4j
 public class UpdateDownloader {
 
     private SSLSocketFactory sslSocketFactory;
 
-    public void downloadUpdate(){
+    //returns the activation status of the server.
+    public boolean getActivationStatus(){
+        return loadLicense();
+    }
+
+
+    public void doUpdate(){
         try {
             if (!loadLicense()) {
                 log.warn("This server does not have a valid license, no files will be download and no update" +
@@ -34,7 +43,8 @@ public class UpdateDownloader {
                         responseData.append((char) con.getInputStream().read());
                         currentSize++;
                     }
-                    log.info("Succesfully downloaded file...");
+                    updateFiles.remove(file);
+                    log.info("Successfully downloaded file...");
                 } else {
                     log.info("An error has occurred while trying to download a file: {} ", con.getResponseCode());
                 }