diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index f3b5ab7..69a5fdc 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -135,7 +135,7 @@ kpxcEvent.onCheckUpdateKeePassXC = async function() {
 };
 
 kpxcEvent.onUpdateAvailableKeePassXC = async function() {
-    return (page.settings.checkUpdateKeePassXC > 0) ? keepass.keePassXCUpdateAvailable() : false;
+    return (page.settings.checkUpdateKeePassXC != CHECK_UPDATE_NEVER) ? keepass.keePassXCUpdateAvailable() : false;
 };
 
 kpxcEvent.onRemoveCredentialsFromTabInformation = async function(tab) {
diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index 777e63f..c13e350 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -955,7 +955,7 @@ keepass.setcurrentKeePassXCVersion = function(version) {
 };
 
 keepass.keePassXCUpdateAvailable = function() {
-    if (page.settings.checkUpdateKeePassXC && page.settings.checkUpdateKeePassXC > 0) {
+    if (page.settings.checkUpdateKeePassXC && page.settings.checkUpdateKeePassXC != CHECK_UPDATE_NEVER) {
         const lastChecked = (keepass.latestKeePassXC.lastChecked) ? new Date(keepass.latestKeePassXC.lastChecked) : new Date(1986, 11, 21);
         const daysSinceLastCheck = Math.floor(((new Date()).getTime() - lastChecked.getTime()) / 86400000);
         if (daysSinceLastCheck >= page.settings.checkUpdateKeePassXC) {
diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index 126b8b4..9482dfb 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -8,7 +8,7 @@ const defaultSettings = {
     autoReconnect: false,
     autoRetrieveCredentials: true,
     autoSubmit: false,
-    checkUpdateKeePassXC: 3,
+    checkUpdateKeePassXC: CHECK_UPDATE_NEVER,
     clearCredentialsTimeout: 10,
     colorTheme: 'system',
     credentialSorting: SORT_BY_GROUP_AND_TITLE,
diff --git a/keepassxc-browser/common/global.js b/keepassxc-browser/common/global.js
index 9d92e89..4fd79ae 100755
--- a/keepassxc-browser/common/global.js
+++ b/keepassxc-browser/common/global.js
@@ -12,6 +12,12 @@ const SORT_BY_USERNAME = 'sortByUsername';
 const SORT_BY_GROUP_AND_TITLE = 'sortByGroupAndTitle';
 const SORT_BY_GROUP_AND_USERNAME = 'sortByGroupAndUsername';
 
+// Update check intervals
+const CHECK_UPDATE_NEVER = 0;
+const CHECK_UPDATE_THREE_DAYS = 3;
+const CHECK_UPDATE_ONE_WEEK = 7;
+const CHECK_UPDATE_ONE_MONTH = 30;
+
 const schemeSegment = '(\\*|http|https|ws|wss|ftp)';
 const hostSegment = '(\\*|(?:\\*\\.)?(?:[^/*]+))?';
 const pathSegment = '(.*)';
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index 10c5329..bbee559 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -278,20 +278,20 @@
                     <div class="mt-3">
                       <div data-i18n="optionsRadioText"></div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="inlineRadio1" value="3">
-                        <label class="form-check-label" for="inlineRadio1"><span data-i18n="optionsRadioThreeDays"></span></label>
+                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="checkUpdateThreeDays">
+                        <label class="form-check-label" for="checkUpdateThreeDays"><span data-i18n="optionsRadioThreeDays"></span></label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="inlineRadio2" value="7">
-                        <label class="form-check-label" for="inlineRadio2"><span data-i18n="optionsRadioWeek"></span></label>
+                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="checkUpdateOneWeek">
+                        <label class="form-check-label" for="checkUpdateOneWeek"><span data-i18n="optionsRadioWeek"></span></label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="inlineRadio3" value="30">
-                        <label class="form-check-label" for="inlineRadio3"><span data-i18n="optionsRadioMonth"></span></label>
+                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="checkUpdateOneMonth">
+                        <label class="form-check-label" for="checkUpdateOneMonth"><span data-i18n="optionsRadioMonth"></span></label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="inlineRadio4" value="0">
-                        <label class="form-check-label" for="inlineRadio4"><span data-i18n="optionsRadioNever"></span></label>
+                        <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="checkUpdateNever">
+                        <label class="form-check-label" for="checkUpdateNever"><span data-i18n="optionsRadioNever"></span></label>
                       </div>
                     </div>
                   </div>
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index 7040d7f..2669dd0 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -93,6 +93,11 @@ options.initGeneralSettings = function() {
         }
     });
 
+    $('#tab-general-settings input[type=radio]#checkUpdateThreeDays').val(CHECK_UPDATE_THREE_DAYS);
+    $('#tab-general-settings input[type=radio]#checkUpdateOneWeek').val(CHECK_UPDATE_ONE_WEEK);
+    $('#tab-general-settings input[type=radio]#checkUpdateOneMonth').val(CHECK_UPDATE_ONE_MONTH);
+    $('#tab-general-settings input[type=radio]#checkUpdateNever').val(CHECK_UPDATE_NEVER);
+
     $('#tab-general-settings input[type=range]').val(options.settings['redirectAllowance']);
     $('#redirectAllowanceLabel').text(tr('optionsRedirectAllowance',
         options.settings['redirectAllowance'] === 11 ? 'Infinite' : String(options.settings['redirectAllowance'])));