diff --git a/jslib b/jslib
index 7e05089d73a..9d411fd37d6 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 7e05089d73a8fae4742b564b41c34c484aefd8a1
+Subproject commit 9d411fd37d61e5829d26062edab940f2b4578334
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index c0fc9f75c3c..c0bb1f495c3 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1939,5 +1939,21 @@
   },
   "service": {
     "message": "Service"
+  },
+  "forwardedEmail": {
+    "message": "Forwarded Email Alias"
+  },
+  "forwardedEmailDesc": {
+    "message": "Generate an email alias with an external forwarding service."
+  },
+  "hostname": {
+    "message": "Hostname",
+    "description": "Part of a URL."
+  },
+  "apiAccessToken": {
+    "message": "API Access Token"
+  },
+  "apiKey": {
+    "message": "API Key"
   }
 }
diff --git a/src/popup/generator/generator.component.html b/src/popup/generator/generator.component.html
index 02650910a2d..f1b87370a2b 100644
--- a/src/popup/generator/generator.component.html
+++ b/src/popup/generator/generator.component.html
@@ -334,6 +334,62 @@
             </label>
           </div>
         </div>
+        <ng-container *ngIf="usernameOptions.forwardedService === 'simplelogin'">
+          <div class="box-content-row" appBoxRow>
+            <label for="simplelogin-apikey">{{ "apiKey" | i18n }}</label>
+            <input
+              id="simplelogin-apikey"
+              type="password"
+              name="SimpleLoginApiKey"
+              [(ngModel)]="usernameOptions.forwardedSimpleLoginApiKey"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+          <div class="box-content-row" appBoxRow>
+            <label for="simplelogin-hostname">{{ "hostname" | i18n }}</label>
+            <input
+              id="simplelogin-hostname"
+              type="text"
+              name="SimpleLoginHostname"
+              [(ngModel)]="usernameOptions.forwardedSimpleLoginHostname"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+        </ng-container>
+        <ng-container *ngIf="usernameOptions.forwardedService === 'anonaddy'">
+          <div class="box-content-row" appBoxRow>
+            <label for="anonaddy-accessToken">{{ "apiAccessToken" | i18n }}</label>
+            <input
+              id="anonaddy-accessToken"
+              type="password"
+              name="AnonAddyAccessToken"
+              [(ngModel)]="usernameOptions.forwardedAnonAddyApiToken"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+          <div class="box-content-row" appBoxRow>
+            <label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
+            <input
+              id="anonaddy-domain"
+              type="text"
+              name="AnonAddyDomain"
+              [(ngModel)]="usernameOptions.forwardedAnonAddyDomain"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+        </ng-container>
+        <ng-container *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
+          <div class="box-content-row" appBoxRow>
+            <label for="firefox-apikey">{{ "apiAccessToken" | i18n }}</label>
+            <input
+              id="firefox-apikey"
+              type="password"
+              name="FirefoxApiKey"
+              [(ngModel)]="usernameOptions.forwardedFirefoxApiToken"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+        </ng-container>
       </div>
     </div>
     <div class="box" *ngIf="usernameOptions.type === 'subaddress'">