diff --git a/common/ASC.OAuth/authorization/src/main/resources/application.yml b/common/ASC.OAuth/authorization/src/main/resources/application.yml
index a910a19ea0..71d125aa17 100644
--- a/common/ASC.OAuth/authorization/src/main/resources/application.yml
+++ b/common/ASC.OAuth/authorization/src/main/resources/application.yml
@@ -38,6 +38,24 @@ docspace:
   server:
     url: http://${DOCSPACE_ADDRESS:localhost:8092}
 
+messaging:
+  rabbitmq:
+    configuration:
+      authorization:
+        exchange: authorization.exchange
+        queue: authorization.queue
+        routing: authorization.routing
+        deadExchange: authorization.dead.exchange
+        deadQueue: authorization.dead.queue
+        deadRouting: authorization.dead.routing
+      consent:
+        exchange: consent.exchange
+        queue: consent.queue
+        routing: consent.routing
+        deadExchange: consent.dead.exchange
+        deadQueue: consent.dead.queue
+        deadRouting: consent.dead.routing
+
 resilience4j:
   bulkhead:
     instances:
diff --git a/common/ASC.OAuth/authorization/src/main/resources/templates/consent.html b/common/ASC.OAuth/authorization/src/main/resources/templates/consent.html
new file mode 100644
index 0000000000..68bb06c808
--- /dev/null
+++ b/common/ASC.OAuth/authorization/src/main/resources/templates/consent.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"
+        integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
+  <title>Custom consent page - Consent required</title>
+  <style>
+        body {
+            background-color: aliceblue;
+        }
+    </style>
+  <script>
+		function cancelConsent() {
+			document.consent_form.reset();
+			document.consent_form.submit();
+		}
+	</script>
+</head>
+<body>
+<div class="container">
+  <div class="py-5">
+    <h1 class="text-center text-primary">App permissions</h1>
+  </div>
+  <div class="row">
+    <div class="col text-center">
+      <p>
+        The application
+        <span class="font-weight-bold text-primary" th:text="${clientId}"></span>
+        wants to access your account
+        <span class="font-weight-bold" th:text="${principalName}"></span>
+      </p>
+    </div>
+  </div>
+  <div class="row pb-3">
+    <div class="col text-center"><p>The following permissions are requested by the above app.<br/>Please review
+      these and consent if you approve.</p></div>
+  </div>
+  <div class="row">
+    <div class="col text-center">
+      <form name="consent_form" method="post" action="/oauth2/authorize">
+        <input type="hidden" name="client_id" th:value="${clientId}">
+        <input type="hidden" name="state" th:value="${state}">
+
+        <div th:each="scope: ${scopes}" class="form-group form-check py-1">
+          <input class="form-check-input"
+                 type="checkbox"
+                 name="scope"
+                 th:value="${scope}"
+                 th:id="${scope}">
+          <label class="form-check-label font-weight-bold" th:for="${scope}" th:text="${scope}"></label>
+        </div>
+
+        <p th:if="${not #lists.isEmpty(previouslyApprovedScopes)}">You have already granted the following permissions to the above app:</p>
+        <div th:each="scope: ${previouslyApprovedScopes}" class="form-group form-check py-1">
+          <input class="form-check-input"
+                 type="checkbox"
+                 th:id="${scope}"
+                 disabled
+                 checked>
+          <label class="form-check-label font-weight-bold" th:for="${scope}" th:text="${scope}"></label>
+        </div>
+
+        <div class="form-group pt-3">
+          <button class="btn btn-primary btn-lg" type="submit" id="submit-consent">
+            Submit Consent
+          </button>
+        </div>
+        <div class="form-group">
+          <button class="btn btn-link regular" type="button" id="cancel-consent" onclick="cancelConsent();">
+            Cancel
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+  <div class="row pt-4">
+    <div class="col text-center">
+      <p>
+        <small>
+          Your consent to provide access is required.
+          <br/>If you do not approve, click Cancel, in which case no information will be shared with the app.
+        </small>
+      </p>
+    </div>
+  </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/common/ASC.OAuth/authorization/src/main/resources/templates/login.html b/common/ASC.OAuth/authorization/src/main/resources/templates/login.html
new file mode 100644
index 0000000000..233509ef52
--- /dev/null
+++ b/common/ASC.OAuth/authorization/src/main/resources/templates/login.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:th="http://www.thymeleaf.org"
+>
+<head>
+    <meta charset="UTF-8">
+    <title>Login System</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+          rel="stylesheet"
+          integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+          crossorigin="anonymous">
+</head>
+<body>
+<div class="container">
+    <div class="row">
+        <div class="col-md-6 offset-md-3">
+
+            <div th:if="${param.error}">
+                <div class="alert alert-danger">Invalid Email or Password</div>
+            </div>
+            <div th:if="${param.logout}">
+                <div class="alert alert-success"> You have been logged out.</div>
+            </div>
+
+            <div class="card">
+                <div class="card-header">
+                    <h2 class="text-center">Login Form</h2>
+                </div>
+                <div class="card-body">
+                    <form
+                            method="post"
+                            role="form"
+                            th:action="@{/login}"
+                            class="form-horizontal"
+                    >
+                        <div class="form-group mb-3">
+                            <label class="control-label"> Email</label>
+                            <input
+                                    type="text"
+                                    id="username"
+                                    name="username"
+                                    class="form-control"
+                                    placeholder="Enter email address"
+                            />
+                        </div>
+
+                        <div class="form-group mb-3">
+                            <label class="control-label"> Password</label>
+                            <input
+                                    type="password"
+                                    id="password"
+                                    name="password"
+                                    class="form-control"
+                                    placeholder="Enter password"
+                            />
+                        </div>
+                        <div class="form-group mb-3">
+                            <button type="submit" class="btn btn-primary" >Submit</button>
+                            <span> Not registered ?
+                                <a th:href="@{/register}">Register/Signup here</a>
+                            </span>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
