diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index ab7bd27..2d6a2d1 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -6,7 +6,8 @@ const defaultSettings = {
     autoFillSingleEntry: false,
     autoRetrieveCredentials: true,
     showNotifications: true,
-    showLoginNotifications: true
+    showLoginNotifications: true,
+    saveDomainOnly: true
 };
 
 var page = {};
@@ -42,6 +43,9 @@ page.initSettings = function() {
             if (!('showLoginNotifications' in page.settings)) {
                 page.settings.showLoginNotifications = defaultSettings.showLoginNotifications;
             }
+            if (!('saveDomainOnly' in page.settings)) {
+                page.settings.saveDomainOnly = defaultSettings.saveDomainOnly;
+            }
             browser.storage.local.set({'settings': page.settings});
             resolve(page.settings);
         });
diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js
index 37d2c73..2a204a8 100755
--- a/keepassxc-browser/keepassxc-browser.js
+++ b/keepassxc-browser/keepassxc-browser.js
@@ -1766,7 +1766,7 @@ cip.rememberCredentials = function(usernameValue, passwordValue) {
 
         let url = jQuery(this)[0].action;
         if (!url) {
-            url = document.location.href;
+            url = cip.settings.saveDomainOnly ? document.location.origin : document.location.href;
             if (url.indexOf('?') > 0) {
                 url = url.substring(0, url.indexOf('?'));
                 if (url.length < document.location.origin.length) {
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index 6538290..4c1a702 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -139,6 +139,15 @@
           </div>
         </p>
         <hr />
+        <p>
+          <div class="checkbox">
+            <label class="checkbox">
+              <input type="checkbox" name="saveDomainOnly" value="true" /> Save domain only.
+            </label>
+            <span class="help-block">When saving new credentials save only the domain instead of full URL.</span>
+          </div>
+        </p>
+        <hr />
         <p>
           Check for updates of KeePassXC:
           <br />