diff --git a/libs/angular/src/components/generator.component.ts b/libs/angular/src/components/generator.component.ts
index 29262919aac..6a104b45dad 100644
--- a/libs/angular/src/components/generator.component.ts
+++ b/libs/angular/src/components/generator.component.ts
@@ -244,7 +244,10 @@ export class GeneratorComponent implements OnInit {
     ];
 
     this.usernameOptions = await this.usernameGenerationService.getOptions();
-    if (this.usernameOptions.forwardedService == null) {
+    if (
+      this.usernameOptions.forwardedService == null ||
+      this.usernameOptions.forwardedService === ""
+    ) {
       this.forwardOptions.push({ name: "", value: null });
     }
 
diff --git a/libs/common/src/services/usernameGeneration.service.ts b/libs/common/src/services/usernameGeneration.service.ts
index ce5857f37cc..7c9eb34e898 100644
--- a/libs/common/src/services/usernameGeneration.service.ts
+++ b/libs/common/src/services/usernameGeneration.service.ts
@@ -17,7 +17,7 @@ const DefaultOptions = {
   wordIncludeNumber: true,
   subaddressType: "random",
   catchallType: "random",
-  forwardedService: "simplelogin",
+  forwardedService: "",
   forwardedAnonAddyDomain: "anonaddy.me",
 };