diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index c530872981..8b50f3965b 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1106,5 +1106,11 @@
   },
   "noCollectionsInList": {
     "message": "There are no collections to list."
+  },
+  "ownership": {
+    "message": "Ownership"
+  },
+  "whoOwnsThisItem": {
+    "message": "Who owns this item?"
   }
 }
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index df10f4d322..6f0d0151f6 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -321,6 +321,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 class="box list" *ngIf="editMode">
             <div class="box-content single-line">
                 <a class="box-content-row" href="#" appStopClick appBlurClick (click)="share()"