diff --git a/openapi/generate_openapi.py b/openapi/generate_openapi.py
index 83966f5bf..429d80ae5 100644
--- a/openapi/generate_openapi.py
+++ b/openapi/generate_openapi.py
@@ -932,47 +932,63 @@ paths:
       operationId: login
       summary: Login with REST API
       consumes:
-        - application/x-www-form-urlencoded
         - application/json
+        - application/x-www-form-urlencoded
       tags:
         - Login
       parameters:
-        - name: username
-          in: formData
+        - name: loginRequest
+          in: body
           required: true
-          description: |
-            Your username
-          type: string
-        - name: password
-          in: formData
-          required: true
-          description: |
-            Your password
-          type: string
-          format: password
+          description: Login credentials
+          schema:
+            type: object
+            required:
+              - username
+              - password
+            properties:
+              username:
+                description: |
+                  Your username
+                type: string
+              password:
+                description: |
+                  Your password
+                type: string
+                format: password
       responses:
         200:
           description: |-
             Successful authentication
           schema:
-            items:
-              properties:
-                id:
-                  type: string
-                token:
-                  type: string
-                tokenExpires:
-                  type: string
+            type: object
+            required:
+              - id
+              - token
+              - tokenExpires
+            properties:
+              id:
+                type: string
+                description: User ID
+              token:
+                type: string
+                description: |
+                  Authentication token
+              tokenExpires:
+                type: string
+                format: date-time
+                description: |
+                  Token expiration date
         400:
           description: |
             Error in authentication
           schema:
-            items:
-              properties:
-                error:
-                  type: number
-                reason:
-                  type: string
+            type: object
+            properties:
+              error:
+                type: string
+              reason:
+                type: string
         default:
           description: |
             Error in authentication
diff --git a/public/api/wekan.yml b/public/api/wekan.yml
index 1a097401f..8426db641 100644
--- a/public/api/wekan.yml
+++ b/public/api/wekan.yml
@@ -31,47 +31,63 @@ paths:
       operationId: login
       summary: Login with REST API
       consumes:
-        - application/x-www-form-urlencoded
         - application/json
+        - application/x-www-form-urlencoded
       tags:
         - Login
       parameters:
-        - name: username
-          in: formData
+        - name: loginRequest
+          in: body
           required: true
-          description: |
-            Your username
-          type: string
-        - name: password
-          in: formData
-          required: true
-          description: |
-            Your password
-          type: string
-          format: password
+          description: Login credentials
+          schema:
+            type: object
+            required:
+              - username
+              - password
+            properties:
+              username:
+                type: string
+                description: |
+                  Your username
+              password:
+                type: string
+                format: password
+                description: |
+                  Your password
       responses:
         200:
           description: |-
             Successful authentication
           schema:
-            items:
-              properties:
-                id:
-                  type: string
-                token:
-                  type: string
-                tokenExpires:
-                  type: string
+            type: object
+            required:
+              - id
+              - token
+              - tokenExpires
+            properties:
+              id:
+                type: string
+                description: User ID
+              token:
+                type: string
+                description: |
+                  Authentication token
+              tokenExpires:
+                type: string
+                format: date-time
+                description: |
+                  Token expiration date
         400:
           description: |
             Error in authentication
           schema:
-            items:
-              properties:
-                error:
-                  type: number
-                reason:
-                  type: string
+            type: object
+            properties:
+              error:
+                type: string
+              reason:
+                type: string
         default:
           description: |
             Error in authentication