diff --git a/src/routes/login.js b/src/routes/login.js
index 3431f3431..03d236e97 100644
--- a/src/routes/login.js
+++ b/src/routes/login.js
@@ -5,6 +5,7 @@ const optionService = require('../services/options');
 const myScryptService = require('../services/my_scrypt');
 const log = require('../services/log');
 const passwordService = require("../services/password");
+const options = require('../services/options');
 
 function loginPage(req, res) {
     res.render('login', { failedAuth: false });
@@ -36,6 +37,7 @@ function setPassword(req, res) {
         return;
     }
 
+    options.setOption("checkForUpdates", req.body['check-for-updates'] == true);
     passwordService.setPassword(password1);
 
     res.redirect('login');
diff --git a/src/views/set_password.ejs b/src/views/set_password.ejs
index d9079c264..e0a8d60f5 100644
--- a/src/views/set_password.ejs
+++ b/src/views/set_password.ejs
@@ -33,6 +33,11 @@
                     <input id="password" name="password2" placeholder="" class="form-control" type="password">
                 </div>
             </div>
+            <div class="form-group">
+                <input id="check-for-updates" type="checkbox" name="check-for-updates">
+                <label for="check-for-updates">Check for updates automatically</label>
+            </div>
+
             <div class="form-group">
                 <button class="btn btn-success">Set password</button>
             </div>