diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 8a15993fcf..ad6f5ab71f 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -139,6 +139,7 @@ export function isTrackingAllowed() {
 }
 
 export enum Submit {
+    DownloadDPA = 'submit_download_dpa',
     Error = 'submit_error',
     AccountCreate = 'submit_account_create',
     AccountLogin = 'submit_account_login',
diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte
index 30bcfb871c..70b21cec8a 100644
--- a/src/lib/elements/forms/button.svelte
+++ b/src/lib/elements/forms/button.svelte
@@ -60,6 +60,7 @@
 
 {#if href}
     <a
+        on:click
         on:click={track}
         {href}
         target={external ? '_blank' : ''}
diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte
index 0b90d5da2b..af7e68f2cc 100644
--- a/src/routes/console/organization-[organization]/settings/+page.svelte
+++ b/src/routes/console/organization-[organization]/settings/+page.svelte
@@ -8,7 +8,8 @@
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { onMount } from 'svelte';
-    import Delete from './deleteOrganization.svelte';
+    import Delete from './deleteOrganizationModal.svelte';
+    import DownloadDPA from './downloadDPA.svelte';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
 
     export let data;
@@ -63,6 +64,8 @@
             </CardGrid>
         </Form>
 
+        <DownloadDPA />
+
         <CardGrid danger>
             <div>
                 <Heading tag="h6" size="7">Delete organization</Heading>
diff --git a/src/routes/console/organization-[organization]/settings/deleteOrganization.svelte b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/settings/deleteOrganization.svelte
rename to src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
diff --git a/src/routes/console/organization-[organization]/settings/downloadDPA.svelte b/src/routes/console/organization-[organization]/settings/downloadDPA.svelte
new file mode 100644
index 0000000000..e6d2a38c18
--- /dev/null
+++ b/src/routes/console/organization-[organization]/settings/downloadDPA.svelte
@@ -0,0 +1,49 @@
+<script lang="ts">
+    import { Box, CardGrid, Heading } from '$lib/components';
+    import { Button } from '$lib/elements/forms';
+    import { sdk } from '$lib/stores/sdk';
+    import { Submit, trackEvent } from '$lib/actions/analytics';
+
+    async function downloadPdf() {
+        trackEvent(Submit.DownloadDPA);
+        const today = new Date().toISOString();
+        const prefs = await sdk.forConsole.account.getPrefs();
+        const newPrefs = { ...prefs, DPA: today };
+        sdk.forConsole.account.updatePrefs(newPrefs);
+    }
+</script>
+
+<CardGrid>
+    <div>
+        <Heading tag="h6" size="7">Download DPA document</Heading>
+    </div>
+    <p class="text">
+        After downloading, have the DPA signed by your organization's compliance authority, such as
+        your CEO or Compliance Manager, and submit it to <a
+            class="link"
+            href="mailto:privacy@appwrite.io">privacy@appwrite.io</a
+        >.
+    </p>
+    <svelte:fragment slot="aside">
+        <Box>
+            <h6>
+                <b>Data Processing Agreement (DPA) document</b>
+            </h6>
+            <p class="text u-margin-block-start-8">
+                The DPA is a legal document that describes the roles and responsibilities of
+                Appwrite and the organization when personal data is processed. Learn more about the
+                DPA.
+            </p>
+            <Button
+                secondary
+                external
+                class="u-margin-block-start-16"
+                on:click={downloadPdf}
+                href="/Appwrite_DPA.pdf"
+                event="download_dpa">
+                <span class="icon-download" aria-hidden="true" />
+                <span class="text">Download</span>
+            </Button>
+        </Box>
+    </svelte:fragment>
+</CardGrid>
diff --git a/static/Appwrite_DPA.pdf b/static/Appwrite_DPA.pdf
new file mode 100644
index 0000000000..322d66ff7a
Binary files /dev/null and b/static/Appwrite_DPA.pdf differ