diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index e4bf979..efd69b1 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -46,13 +46,13 @@ browser.storage.local.get({ 'latestKeePassXC': { 'version': '', 'lastChecked': n
 //--------------------------------------------------------------------------
 
 keepass.addCredentials = async function(tab, args = []) {
-    const [ username, password, url, group, groupUuid ] = args;
-    return keepass.updateCredentials(tab, [ null, username, password, url, group, groupUuid ]);
+    const [ username, password, url, group, groupUuid, generatePassword ] = args;
+    return keepass.updateCredentials(tab, [ null, username, password, url, group, groupUuid, generatePassword ]);
 };
 
 keepass.updateCredentials = async function(tab, args = []) {
     try {
-        const [ entryId, username, password, url, group, groupUuid ] = args;
+        const [ entryId, username, password, url, group, groupUuid, generatePassword ] = args;
         const taResponse = await keepass.testAssociation(tab);
         if (!taResponse) {
             browserAction.showDefault(tab);
@@ -69,7 +69,8 @@ keepass.updateCredentials = async function(tab, args = []) {
             login: username,
             password: password,
             url: url,
-            submitUrl: url
+            submitUrl: url,
+            generatePassword: generatePassword
         };
 
         if (entryId) {
diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index 6229ff9..3c91af2 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -176,8 +176,14 @@ page.addNewCredential = async function(tab, args) {
     };
 
     const saveToDefaultGroup = async function(creds) {
-        const args = [ creds.username, creds.password, creds.url, creds.group ];
-        const res = await keepass.addCredentials(tab, args);
+        const res = await keepass.addCredentials(tab, [
+            creds.username,
+            creds.password,
+            creds.url,
+            creds.group,
+            undefined,
+            creds?.generatePassword
+        ]);
         return res;
     };
 
@@ -206,6 +212,7 @@ page.addNewCredential = async function(tab, args) {
                 args.url,
                 newGroup.name,
                 newGroup.uuid,
+                args?.generatePassword
             ]);
             return res;
         }
@@ -219,6 +226,7 @@ page.addNewCredential = async function(tab, args) {
         args.url,
         groupName,
         groupUUID,
+        args?.generatePassword
     ]);
     return res;
 };
diff --git a/keepassxc-browser/popups/popup.html b/keepassxc-browser/popups/popup.html
index de48d9b..2f6771c 100644
--- a/keepassxc-browser/popups/popup.html
+++ b/keepassxc-browser/popups/popup.html
@@ -158,7 +158,7 @@
               <input type="text" class="form-control form-control-sm" id="add-credentials-username" data-i18n="[placeholder]username" required>
             </div>
             <div class="pb-2">
-              <input type="password" class="form-control form-control-sm" id="add-credentials-password"data-i18n="[placeholder]password" required>
+              <input type="password" class="form-control form-control-sm" id="add-credentials-password"data-i18n="[placeholder]password">
               <div class="form-text help-text" id="add-credentials-password-help-text">
                 <span data-i18n="popupAddCredentialsPasswordText"></span>
               </div>
diff --git a/keepassxc-browser/popups/popup_functions.js b/keepassxc-browser/popups/popup_functions.js
index 7a37f18..0f8a874 100644
--- a/keepassxc-browser/popups/popup_functions.js
+++ b/keepassxc-browser/popups/popup_functions.js
@@ -91,13 +91,15 @@ async function addNewCredential() {
         return [];
     }
 
+    const password = $('input#add-credentials-password')?.value;
     browser.tabs.sendMessage(tab?.id, {
         action: 'add_new_credential', args: {
             username: $('input#add-credentials-username')?.value,
-            password: $('input#add-credentials-password')?.value,
+            password: password,
             group: $('input#add-credentials-group')?.value,
             title: $('input#add-credentials-title')?.value,
             url: $('input#add-credentials-url')?.value,
+            generatePassword: !password || password?.length === 0
         }
     });
 }
diff --git a/keepassxc-browser/popups/popup_login.html b/keepassxc-browser/popups/popup_login.html
index 777b36f..f01b625 100644
--- a/keepassxc-browser/popups/popup_login.html
+++ b/keepassxc-browser/popups/popup_login.html
@@ -73,7 +73,7 @@
               <input type="text" class="form-control form-control-sm" id="add-credentials-username" data-i18n="[placeholder]username" required>
             </div>
             <div class="pb-2">
-              <input type="password" class="form-control form-control-sm" id="add-credentials-password"data-i18n="[placeholder]password" required>
+              <input type="password" class="form-control form-control-sm" id="add-credentials-password"data-i18n="[placeholder]password">
               <div class="form-text help-text" id="add-credentials-password-help-text">
                 <span data-i18n="popupAddCredentialsPasswordText"></span>
               </div>
diff --git a/keepassxc-protocol.md b/keepassxc-protocol.md
index 74def34..07a3726 100644
--- a/keepassxc-protocol.md
+++ b/keepassxc-protocol.md
@@ -366,7 +366,7 @@ Response message data (success, decrypted):
 ```
 
 ### set-login
-Unencrypted message (downloadFavicon supported in KeePassXC 2.7.0 and later, but not when updating credentials):
+Unencrypted message:
 ```json
 {
     "action": "set-login",
@@ -379,7 +379,8 @@ Unencrypted message (downloadFavicon supported in KeePassXC 2.7.0 and later, but
     "group": "<group name>",
     "groupUuid": "<group UUID>",
     "uuid": "<entry UUID>",
-    "downloadFavicon": "true"
+    "downloadFavicon": "true" (KeePassXC 2.7.0 and later, but not when updating credentials)
+    "generatePassword": "true" (KeePassXC 2.7.11 and later)
 }
 ```