diff --git a/jslib b/jslib
index e90cc40f68..2db9e1ce0d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e90cc40f68f2605e76a93c4e854d885ac93d955c
+Subproject commit 2db9e1ce0d7a702f07f20ecb916dd8191ff617e1
diff --git a/src/app/vault/add-edit-custom-fields.component.html b/src/app/vault/add-edit-custom-fields.component.html
index f103c6e5f3..83458a2d90 100644
--- a/src/app/vault/add-edit-custom-fields.component.html
+++ b/src/app/vault/add-edit-custom-fields.component.html
@@ -16,6 +16,7 @@
             <div class="col-7 form-group">
                 <label for="fieldValue{{i}}">{{'value' | i18n}}</label>
                 <div class="d-flex align-items-center">
+                    <!-- Text -->
                     <div class="input-group" *ngIf="f.type === fieldType.Text">
                         <input id="fieldValue{{i}}" class="form-control" type="text" name="Field.Value{{i}}"
                             [(ngModel)]="f.value" appInputVerbatim
@@ -28,6 +29,7 @@
                             </button>
                         </div>
                     </div>
+                    <!-- Hidden -->
                     <div class="input-group" *ngIf="f.type === fieldType.Hidden">
                         <input id="fieldValue{{i}}" type="{{f.showValue ? 'text' : 'password'}}"
                             name="Field.Value{{i}}" [(ngModel)]="f.value"
@@ -49,7 +51,16 @@
                             </button>
                         </div>
                     </div>
+                    <!-- Linked -->
+                    <div class="input-group" *ngIf="f.type === fieldType.Linked">
+                        <select id="fieldValue{{i}}" name="Field.Value{{i}}" class="form-control" [(ngModel)]="f.linkedId"
+                            *ngIf="f.type === fieldType.Linked && cipher.linkedFieldOptions != null"
+                            [disabled]="cipher.isDeleted || viewOnly">
+                            <option *ngFor="let o of linkedFieldOptions" [ngValue]="o.value">{{o.name}}</option>
+                        </select>
+                    </div>
                     <div class="flex-fill">
+                        <!-- Boolean -->
                         <input id="fieldValue{{i}}" name="Field.Value{{i}}" type="checkbox"
                             [(ngModel)]="f.value" *ngIf="f.type === fieldType.Boolean" appTrueFalseValue
                             trueValue="true" falseValue="false" [disabled]="cipher.isDeleted || viewOnly">
@@ -66,6 +77,7 @@
             </div>
         </div>
     </div>
+    <!-- Add new custom field -->
     <a href="#" appStopClick (click)="addField()" class="d-inline-block mb-2"
         *ngIf="!cipher.isDeleted && !viewOnly">
         <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i> {{'newCustomField' | i18n}}
@@ -75,6 +87,9 @@
             <label for="addFieldType" class="sr-only">{{'type' | i18n}}</label>
             <select id="addFieldType" class="form-control" name="AddFieldType" [(ngModel)]="addFieldType">
                 <option *ngFor="let o of addFieldTypeOptions" [ngValue]="o.value">{{o.name}}</option>
+                <option *ngIf="cipher.linkedFieldOptions != null" [ngValue]="addFieldLinkedTypeOption.value">
+                    {{addFieldLinkedTypeOption.name}}
+                </option>
             </select>
         </div>
     </div>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index fc06e9b0bc..c307cf29ae 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -388,8 +388,8 @@
                     <textarea id="notes" name="Notes" rows="6" [(ngModel)]="cipher.notes"
                         [disabled]="cipher.isDeleted || viewOnly" class="form-control"></textarea>
                 </div>
-                <app-vault-add-edit-custom-fields [cipher]="cipher" [viewOnly]="viewOnly" [copy]="copy.bind(this)">
-                </app-vault-add-edit-custom-fields>
+                <app-vault-add-edit-custom-fields [cipher]="cipher" [thisCipherType]="cipher.type" [viewOnly]="viewOnly"
+                    [copy]="copy.bind(this)"></app-vault-add-edit-custom-fields>
                 <ng-container *ngIf="allowOwnershipAssignment()">
                     <h3 class="mt-4">{{'ownership' | i18n}}</h3>
                     <div class="row">
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 0be9c58aac..c31eb8591c 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -166,6 +166,10 @@
   "cfTypeBoolean": {
     "message": "Boolean"
   },
+  "cfTypeLinked": {
+    "message": "Linked",
+    "description": "This describes a field that is 'linked' (related) to another field."
+  },
   "remove": {
     "message": "Remove"
   },
@@ -311,6 +315,9 @@
   "lastName": {
     "message": "Last Name"
   },
+  "fullName": {
+    "message": "Full Name"
+  },
   "address1": {
     "message": "Address 1"
   },