diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 78a2dbe961..a1c78018e8 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -303,6 +303,36 @@
                     </div>
                 </div>
             </div>
+            <div class="box" *ngIf="!editMode && ownershipOptions && ownershipOptions.length > 1">
+                <div class="box-header">
+                    {{'ownership' | i18n}}
+                </div>
+                <div class="box-content">
+                    <div class="box-content-row" appBoxRow>
+                        <label for="organizationId">{{'whoOwnsThisItem' | i18n}}</label>
+                        <select id="organizationId" class="form-control" name="OrganizationId"
+                                [(ngModel)]="cipher.organizationId" (change)="organizationChanged()">
+                            <option *ngFor="let o of ownershipOptions" [ngValue]="o.value">{{o.name}}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="box" *ngIf="!editMode && cipher.organizationId">
+                <div class="box-header">
+                    {{'collections' | i18n}}
+                </div>
+                <div class="box-content" *ngIf="!collections || !collections.length">
+                    {{'noCollectionsInList' | i18n}}
+                </div>
+                <div class="box-content" *ngIf="collections && collections.length">
+                    <div class="box-content-row box-content-row-checkbox"
+                         *ngFor="let c of collections; let i = index" appBoxRow>
+                        <label for="collection_{{i}}">{{c.name}}</label>
+                        <input id="collection_{{i}}" type="checkbox" [(ngModel)]="c.checked"
+                               name="Collection[{{i}}].Checked">
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="footer">
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 32ee5891b7..a46d3c406d 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1118,5 +1118,11 @@
   },
   "noCollectionsInList": {
     "message": "There are no collections to list."
+  },
+  "ownership": {
+    "message": "Ownership"
+  },
+  "whoOwnsThisItem": {
+    "message": "Who owns this item?"
   }
 }