diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 7559a33f..cd4f5414 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -10,7 +10,10 @@
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" *ngIf="!organizations || !organizations.length">
+                {{'noOrganizationsList' | i18n}}
+            </div>
+            <div class="modal-body" *ngIf="organizations && organizations.length">
                 <p>{{'shareDesc' | i18n}}</p>
                 <div class="form-group">
                     <label for="organization">{{'organization' | i18n}}</label>
@@ -46,10 +49,13 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading" *ngIf="organizations && organizations.length">
                     <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
+                <a href="#" routerLink="/settings/create-organization" class="btn btn-primary" *ngIf="!organizations || !organizations.length">
+                    {{'newOrganization' | i18n}}
+                </a>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="{{'cancel' | i18n}}">{{'cancel' | i18n}}</button>
             </div>
         </form>