diff --git a/jslib b/jslib
index 9b008ff382d..ef5eebba66d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 9b008ff382d1dd6682185cf092afbf02a83ce951
+Subproject commit ef5eebba66d606d53cf4bc730426ea393276e801
diff --git a/src/app/organizations/add-edit.component.ts b/src/app/organizations/add-edit.component.ts
index b277ff91383..66e8341367d 100644
--- a/src/app/organizations/add-edit.component.ts
+++ b/src/app/organizations/add-edit.component.ts
@@ -50,6 +50,13 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
         }
     }
 
+    protected encryptCipher() {
+        if (!this.editMode) {
+            this.cipher.organizationId = this.organization.id;
+        }
+        return super.encryptCipher();
+    }
+
     protected async saveCipher(cipher: Cipher) {
         if (this.organization.isAdmin) {
             const request = new CipherRequest(cipher);
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index f316f4a189a..e2b2136fa6a 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -10,7 +10,7 @@
                 </td>
                 <td (click)="checkCipher(c)">
                     <a href="#" appStopClick appStopProp (click)="selectCipher(c)" title="{{'editItem' | i18n}}">{{c.name}}</a>
-                    <i class="fa fa-share-alt" appStopProp *ngIf="c.organizationId" title="{{'shared' | i18n}}"></i>
+                    <i class="fa fa-share-alt" appStopProp *ngIf="!organization && c.organizationId" title="{{'shared' | i18n}}"></i>
                     <i class="fa fa-paperclip" appStopProp *ngIf="c.hasAttachments" title="{{'attachments' | i18n}}"></i>
                     <br>
                     <small appStopProp>{{c.subTitle}}</small>