diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index fe5400c6a90..f8ffeff747e 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -2407,6 +2407,9 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
+  "aliasDomain": {
+    "message": "Alias domain"
+  },
   "passwordRepromptDisabledAutofillOnPageLoad": {
     "message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
     "description": "Toast message for describing that master password re-prompt cannot be auto-filled on page load."
diff --git a/apps/browser/src/tools/popup/generator/generator.component.html b/apps/browser/src/tools/popup/generator/generator.component.html
index 13d35b6cd7a..cf7a2949f24 100644
--- a/apps/browser/src/tools/popup/generator/generator.component.html
+++ b/apps/browser/src/tools/popup/generator/generator.component.html
@@ -378,7 +378,7 @@
             />
           </div>
           <div class="box-content-row" appBoxRow>
-            <label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
+            <label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
             <input
               id="anonaddy-domain"
               type="text"
@@ -387,6 +387,16 @@
               (blur)="saveUsernameOptions()"
             />
           </div>
+          <div class="box-content-row" appBoxRow>
+            <label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
+            <input
+              id="anonaddy-baseUrl"
+              type="text"
+              name="AnonAddyDomain"
+              [(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
         </ng-container>
         <ng-container *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
           <div class="box-content-row" appBoxRow>
@@ -424,7 +434,7 @@
             />
           </div>
           <div class="box-content-row" appBoxRow>
-            <label for="forwardemail-domain">{{ "domainName" | i18n }}</label>
+            <label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
             <input
               id="forwardemail-domain"
               type="text"
diff --git a/apps/desktop/src/app/tools/generator.component.html b/apps/desktop/src/app/tools/generator.component.html
index 93d82d4d949..1b2ee9df42e 100644
--- a/apps/desktop/src/app/tools/generator.component.html
+++ b/apps/desktop/src/app/tools/generator.component.html
@@ -405,7 +405,7 @@
                   />
                 </div>
                 <div class="box-content-row" appBoxRow>
-                  <label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
+                  <label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
                   <input
                     id="anonaddy-domain"
                     type="text"
@@ -414,6 +414,16 @@
                     (blur)="saveUsernameOptions()"
                   />
                 </div>
+                <div class="box-content-row" appBoxRow>
+                  <label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
+                  <input
+                    id="anonaddy-baseUrl"
+                    type="text"
+                    name="AnonAddyDomain"
+                    [(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
+                    (blur)="saveUsernameOptions()"
+                  />
+                </div>
               </ng-container>
               <ng-container *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
                 <div class="box-content-row" appBoxRow>
@@ -451,7 +461,7 @@
                   />
                 </div>
                 <div class="box-content-row" appBoxRow>
-                  <label for="forwardemail-domain">{{ "domainName" | i18n }}</label>
+                  <label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
                   <input
                     id="forwardemail-domain"
                     type="text"
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 09d848c3638..48e3f0e7bd0 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -2415,5 +2415,8 @@
   },
   "submenu": {
     "message": "Submenu"
+  },
+  "aliasDomain": {
+    "message": "Alias domain"
   }
 }
diff --git a/apps/web/src/app/tools/generator.component.html b/apps/web/src/app/tools/generator.component.html
index 3d4fe704dda..c690a458dab 100644
--- a/apps/web/src/app/tools/generator.component.html
+++ b/apps/web/src/app/tools/generator.component.html
@@ -309,7 +309,7 @@
         />
       </div>
       <div class="form-group col-4">
-        <label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
+        <label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
         <input
           id="anonaddy-domain"
           class="form-control"
@@ -318,6 +318,17 @@
           (blur)="saveUsernameOptions()"
         />
       </div>
+      <div class="form-group col-4" *ngIf="isSelfHosted">
+        <label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
+        <input
+          id="anonaddy-baseUrl"
+          class="form-control"
+          type="text"
+          name="AnonAddyDomain"
+          [(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
+          (blur)="saveUsernameOptions()"
+        />
+      </div>
     </div>
     <div class="row" *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
       <div class="form-group col-4">
@@ -355,7 +366,7 @@
         />
       </div>
       <div class="form-group col-4">
-        <label for="forwardemail-domain">{{ "domainName" | i18n }}</label>
+        <label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
         <input
           id="forwardemail-domain"
           class="form-control"
diff --git a/apps/web/src/app/tools/generator.component.ts b/apps/web/src/app/tools/generator.component.ts
index 05c56141dc2..7eb8d6cf23b 100644
--- a/apps/web/src/app/tools/generator.component.ts
+++ b/apps/web/src/app/tools/generator.component.ts
@@ -43,6 +43,10 @@ export class GeneratorComponent extends BaseGeneratorComponent {
     }
   }
 
+  get isSelfHosted(): boolean {
+    return this.platformUtilsService.isSelfHost();
+  }
+
   async history() {
     this.dialogService.open(PasswordGeneratorHistoryComponent);
   }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 9768f45fd5d..61a586c53fb 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7169,6 +7169,12 @@
   "beta": {
     "message": "Beta"
   },
+  "baseUrl": {
+    "message": "Server URL"
+  },
+  "aliasDomain": {
+    "message": "Alias domain"
+  },
   "alreadyHaveAccount": {
     "message": "Already have an account?"
   }
diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js
index 96deb2f80e8..02546368958 100644
--- a/apps/web/webpack.config.js
+++ b/apps/web/webpack.config.js
@@ -280,7 +280,7 @@ const devServer =
                   http://127.0.0.1:10000
                   https://app.simplelogin.io/api/alias/random/new
                   https://quack.duckduckgo.com/api/email/addresses
-                  https://app.anonaddy.com/api/v1/aliases
+                  https://app.addy.io/api/v1/aliases
                   https://api.fastmail.com
                   https://api.forwardemail.net
                   http://localhost:5000
diff --git a/libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts b/libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts
index 2b7563b2c39..c50326e1fa4 100644
--- a/libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts
+++ b/libs/common/src/tools/generator/username/email-forwarders/anon-addy-forwarder.ts
@@ -11,6 +11,10 @@ export class AnonAddyForwarder implements Forwarder {
     if (options.anonaddy?.domain == null || options.anonaddy.domain === "") {
       throw "Invalid addy.io domain.";
     }
+    if (options.anonaddy?.baseUrl == null || options.anonaddy.baseUrl === "") {
+      throw "Invalid addy.io url.";
+    }
+
     const requestInit: RequestInit = {
       redirect: "manual",
       cache: "no-store",
@@ -21,7 +25,7 @@ export class AnonAddyForwarder implements Forwarder {
         "X-Requested-With": "XMLHttpRequest",
       }),
     };
-    const url = "https://app.addy.io/api/v1/aliases";
+    const url = options.anonaddy.baseUrl + "/api/v1/aliases";
     requestInit.body = JSON.stringify({
       domain: options.anonaddy.domain,
       description:
@@ -37,6 +41,9 @@ export class AnonAddyForwarder implements Forwarder {
     if (response.status === 401) {
       throw "Invalid addy.io API token.";
     }
+    if (response?.statusText != null) {
+      throw "addy.io error:\n" + response.statusText;
+    }
     throw "Unknown addy.io error occurred.";
   }
 }
diff --git a/libs/common/src/tools/generator/username/email-forwarders/forwarder-options.ts b/libs/common/src/tools/generator/username/email-forwarders/forwarder-options.ts
index 0340eedca8f..cca6dd34dd1 100644
--- a/libs/common/src/tools/generator/username/email-forwarders/forwarder-options.ts
+++ b/libs/common/src/tools/generator/username/email-forwarders/forwarder-options.ts
@@ -12,6 +12,7 @@ export class FastmailForwarderOptions {
 
 export class AnonAddyForwarderOptions {
   domain: string;
+  baseUrl: string;
 }
 
 export class ForwardEmailForwarderOptions {
diff --git a/libs/common/src/tools/generator/username/username-generation-options.ts b/libs/common/src/tools/generator/username/username-generation-options.ts
index 96b6e2ef1be..970f7e945e3 100644
--- a/libs/common/src/tools/generator/username/username-generation-options.ts
+++ b/libs/common/src/tools/generator/username/username-generation-options.ts
@@ -10,6 +10,7 @@ export type UsernameGeneratorOptions = {
   forwardedService?: string;
   forwardedAnonAddyApiToken?: string;
   forwardedAnonAddyDomain?: string;
+  forwardedAnonAddyBaseUrl?: string;
   forwardedDuckDuckGoToken?: string;
   forwardedFirefoxApiToken?: string;
   forwardedFastmailApiToken?: string;
diff --git a/libs/common/src/tools/generator/username/username-generation.service.ts b/libs/common/src/tools/generator/username/username-generation.service.ts
index b1fed147db0..35a3a73da90 100644
--- a/libs/common/src/tools/generator/username/username-generation.service.ts
+++ b/libs/common/src/tools/generator/username/username-generation.service.ts
@@ -24,6 +24,7 @@ const DefaultOptions: UsernameGeneratorOptions = {
   catchallType: "random",
   forwardedService: "",
   forwardedAnonAddyDomain: "anonaddy.me",
+  forwardedAnonAddyBaseUrl: "https://app.addy.io",
   forwardedForwardEmailDomain: "hideaddress.net",
 };
 
@@ -131,6 +132,7 @@ export class UsernameGenerationService implements UsernameGenerationServiceAbstr
       forwarder = new AnonAddyForwarder();
       forwarderOptions.apiKey = o.forwardedAnonAddyApiToken;
       forwarderOptions.anonaddy.domain = o.forwardedAnonAddyDomain;
+      forwarderOptions.anonaddy.baseUrl = o.forwardedAnonAddyBaseUrl;
     } else if (o.forwardedService === "firefoxrelay") {
       forwarder = new FirefoxRelayForwarder();
       forwarderOptions.apiKey = o.forwardedFirefoxApiToken;