diff --git a/app/frontend/src/components/Controls.vue b/app/frontend/src/components/Controls.vue
index ae2f431..da2e62b 100644
--- a/app/frontend/src/components/Controls.vue
+++ b/app/frontend/src/components/Controls.vue
@@ -2,7 +2,7 @@
     <div class="controls" v-if="display">
         <i class="off-icon" v-on:click="action('shutdown')" v-if="off_available"></i>
         <i class="quit-icon" v-on:click="action('quit')" v-if="quit_available"></i>
-        <i :class="[ update_available ? 'update-icon' :'no-update-icon' ]" v-if="update_possibe" @click="$router.push({ name: 'update' })"></i>
+        <i :class="[ update_available ? 'update-icon' :'no-update-icon' ]" @click="$router.push({ name: 'update' })"></i>
     </div>
 </template>
 <script>
@@ -39,7 +39,7 @@ export default {
                   this.update_available = false
                   this.update_possible = true
                 }
-              } else {
+              } else {  
                   this.update_possible = false
               }
             })
diff --git a/config.yaml b/config.yaml
index e97d867..1b636ae 100644
--- a/config.yaml
+++ b/config.yaml
@@ -50,7 +50,8 @@ frontend:
   sparklines: true
   virtual_keyboard: true
   user_lang: userlang
-
+  update: updateoption
+  
 # NETWORK -
 # Some elements related to the network configuration, such as
 # the interfaces (updated during the install), the list of SSIDs
diff --git a/install.sh b/install.sh
index 41c123a..6fa86ff 100644
--- a/install.sh
+++ b/install.sh
@@ -97,6 +97,19 @@ set_kioskmode() {
     fi
 }
 
+set_update() {
+    echo -n "[?] Do you want to be able to update TinyCheck from the frontend interface? [Yes/No] "
+    read answer
+    if [[ "$answer" =~ ^([yY][eE][sS]|[yY])$ ]]
+    then
+        sed -i "s/updateoption/true/g" /usr/share/tinycheck/config.yaml
+        echo -e "\e[92m    [✔] You'll be able to update it from the frontend!\e[39m"
+    else
+        sed -i "s/updateoption/false/g" /usr/share/tinycheck/config.yaml
+        echo -e "\e[92m    [✔] You'll need to pass by the console script to update TinyCheck.\e[39m"
+    fi
+}
+
 create_directory() {
     # Create the TinyCheck directory and move the whole stuff there.
     echo -e "[+] Creating TinyCheck folder under /usr/share/"
diff --git a/update.sh b/update.sh
index 96ec877..fbb1a2e 100644
--- a/update.sh
+++ b/update.sh
@@ -7,7 +7,7 @@ fi
 if [ $PWD = "/usr/share/tinycheck" ]; then
     echo "[+] Cloning the current repository to /tmp/"
     rm -rf /tmp/tinycheck/ &> /dev/null 
-    cd /tmp/ && git clone https://github.com/KasperskyLab/tinycheck
+    cd /tmp/ && git clone --branch update-feature https://github.com/KasperskyLab/tinycheck
     cd /tmp/tinycheck && bash update.sh
 elif [ $PWD = "/tmp/tinycheck" ]; then
 
@@ -61,6 +61,10 @@ elif [ $PWD = "/tmp/tinycheck" ]; then
         sed -i 's/analysis:/analysis:\n  active: true/g' /usr/share/tinycheck/config.yaml
     fi
 
+    if ! grep -q update /usr/share/tinycheck/config.yaml; then
+        sed -i 's/frontend:/frontend:\n  update: true/g' /usr/share/tinycheck/config.yaml
+    fi
+
     if ! grep -q "CN=R3,O=Let's Encrypt,C=US" /usr/share/tinycheck/config.yaml; then
         sed -i "s/free_issuers:/free_issuers:\n  - CN=R3,O=Let's Encrypt,C=US/g" /usr/share/tinycheck/config.yaml
     fi