diff --git a/data/web/api/openapi.yaml b/data/web/api/openapi.yaml
index 8c3eb75e..e1ef65bb 100644
--- a/data/web/api/openapi.yaml
+++ b/data/web/api/openapi.yaml
@@ -3520,39 +3520,6 @@ paths:
       description: You can list mailbox aliases existing in system.
       operationId: Get aliases
       summary: Get aliases
-  "/api/v1/get/app-passwd/all":
-    get:
-        - description: e.g. api-key-string
-          example: api-key-string
-          in: header
-          name: X-API-Key
-          required: false
-          schema:
-            type: string
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - active: "1"
-                      created: "2019-12-21 16:04:55"
-                      domain: mailcow.email
-                      id: 2
-                      mailbox: hello@mailcow.email
-                      modified: null
-                      name: emclient
-          description: OK
-          headers: {}
-      tags:
-        - App Passwords
-      description: >-
-        Using this endpoint you can get all app passwords from all mailboxes.
-      operationId: Get App Passwords
-      summary: Get App Passwords
   "/api/v1/get/app-passwd/all/{mailbox}":
     get:
       parameters:
diff --git a/data/web/inc/functions.app_passwd.inc.php b/data/web/inc/functions.app_passwd.inc.php
index 9b19aebe..b493fc91 100644
--- a/data/web/inc/functions.app_passwd.inc.php
+++ b/data/web/inc/functions.app_passwd.inc.php
@@ -216,17 +216,10 @@ function app_passwd($_action, $_data = null) {
     break;
     case 'get':
       $app_passwds = array();
-      if ($_data['username'] != null) {
-        $stmt = $pdo->prepare("SELECT `id`, `name` FROM `app_passwd` WHERE `mailbox` = :username");
-        $stmt->execute(array(':username' => $username));
-        $app_passwds = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        return $app_passwds;
-      } else {
-        $stmt = $pdo->prepare("SELECT `id`, `name` FROM `app_passwd`");
-        $stmt->execute();
-        $app_passwds = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        return $app_passwds;
-      }
+      $stmt = $pdo->prepare("SELECT `id`, `name` FROM `app_passwd` WHERE `mailbox` = :username");
+      $stmt->execute(array(':username' => $username));
+      $app_passwds = $stmt->fetchAll(PDO::FETCH_ASSOC);
+      return $app_passwds;
     break;
     case 'details':
       $app_passwd_data = array();