diff --git a/src/app/settings/organizations.component.html b/src/app/settings/organizations.component.html
index cccf855c94..c2d207d29b 100644
--- a/src/app/settings/organizations.component.html
+++ b/src/app/settings/organizations.component.html
@@ -25,14 +25,20 @@
                 <i class="fa fa-spinner fa-spin text-muted" *ngIf="action.loading" title="{{'loading' | i18n}}"></i>
             </small>
         </h1>
-        <a href="#" routerLink="/settings/create-organization" class="btn btn-sm btn-outline-primary ml-auto">
+        <a href="#" routerLink="/settings/create-organization" class="btn btn-sm btn-outline-primary ml-auto" *ngIf="!loaded || (organizations && organizations.length)">
             <i class="fa fa-plus fa-fw"></i>
             {{'newOrganization' | i18n}}
         </a>
     </div>
     <i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded" title="{{'loading' | i18n}}"></i>
     <ng-container *ngIf="loaded">
-        <p *ngIf="!organizations || !organizations.length">{{'noOrganizationsList' | i18n}}</p>
+        <ng-container *ngIf="!organizations || !organizations.length">
+            <p>{{'noOrganizationsList' | i18n}}</p>
+            <a href="#" routerLink="/settings/create-organization" class="btn btn-outline-primary ml-auto">
+                <i class="fa fa-plus fa-fw"></i>
+                {{'newOrganization' | i18n}}
+            </a>
+        </ng-container>
         <table class="table table-hover table-list" *ngIf="organizations && organizations.length">
             <tbody>
                 <tr *ngFor="let o of organizations">