diff --git a/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.html b/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.html
index bd62085c711fbf003a0e378516ccae08cd409f6b..96eb2f17354e53d6e5c22c18e61059be5e1874ed 100644
--- a/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.html
+++ b/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.html
@@ -79,6 +79,9 @@
                         type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
             </div>
                
+            <div>
+                <div *ngIf="errorMessage" class="alert alert-danger mt-2">{{ errorMessage }}</div>
+            </div>
 
             </div>
         </form>
diff --git a/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.ts b/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.ts
index 9c64e1dbfcd9a9d6da75f5c135e04158c0014cd5..573ac609fdbbddd58701c186e96f835f665c44f1 100644
--- a/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.ts
+++ b/src/app/appmarket/admin/webhook/webhook-details/webhook-details.component.ts
@@ -15,6 +15,8 @@ export class WebhookDetailsComponent extends BaseComponent implements OnInit {
   public webhook: Webhook;
   public authRequired: boolean = false;
 
+  public errorMessage: string = "";
+
   constructor(private service: WebhookService,
       public router: Router,
       private route: ActivatedRoute) {
@@ -42,6 +44,9 @@ export class WebhookDetailsComponent extends BaseComponent implements OnInit {
         this.service.update(this.webhook).subscribe(result => {
             console.log(result);
             this.webhook = result;
+        }, error => {
+            console.error(error);
+            this.errorMessage = "Error updating webhook: " + error.message;
         });
     }
 }
diff --git a/src/app/shared/admin/clusters/manager/manager.component.ts b/src/app/shared/admin/clusters/manager/manager.component.ts
index f077af8c780e65cb88798b4c7117ca5fe1c0a24c..13824140aa0533ac7c928bc079dbaf8e2dad97ea 100644
--- a/src/app/shared/admin/clusters/manager/manager.component.ts
+++ b/src/app/shared/admin/clusters/manager/manager.component.ts
@@ -47,6 +47,10 @@ export class ClusterManagerComponent {
   }
 
   public closeModalAndSaveCluster() {
+    if(this.addedCluster.domainNames !== undefined && this.addedCluster.domainNames !== null) {
+      this.addedCluster.domainNames = [null];
+    }
+    console.log(this.addedCluster);
        this.clusterService.sendCluster(this.updatedFile, this.addedCluster).subscribe(result => {
             console.log(result);
             this.getAllClusters();
diff --git a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html
index 9f7c872af6f0fe143d19d6bf09102cd51986309c..a87890ce1445ac06986b21429be4b333898c52c9 100644
--- a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html
+++ b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html
@@ -47,12 +47,14 @@
                     </div>
                 </div>
 
+
+                <!-- TODO: Fix selector, show value on init when selectedDomain is null/empty  -->
                 <div class="form-group">
                     <label for="clusterCreationDate" class="col-sm-2 control-label">{{ 'CLUSTERS.DOMAIN' | translate }}</label>
                     <div class="col-sm-10">
                         <div class="col-sm-10">
                             <select id="domain" #domainSelect class="form-control" (change)="onDomainSelection(domainSelect.value)">
-                                <option *ngFor="let domain of domains" [selected]="cluster.domainNames[0] === domain.name" [value]="domain.name"
+                                <option *ngFor="let domain of domains" [selected]="selectedDomain" [value]="domain.name"
                                     >{{domain.name}}
                                 </option>
                             </select>         
diff --git a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.ts b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.ts
index 1f275e021482b68feb11db39c7a9709ea70cda5b..14fa854a874dcb4356c6692ebcde6c4e76628ebf 100644
--- a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.ts
+++ b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.ts
@@ -17,6 +17,7 @@ export class ClusterManagerDetailsComponent extends BaseComponent implements OnI
   public cluster: ClusterManager ;
   public cluterId;
   public error = "";
+  public selectedDomain: string = ""
 
   public domains = [];
 
@@ -50,6 +51,9 @@ export class ClusterManagerDetailsComponent extends BaseComponent implements OnI
         this.clusterService.getClusterDetails(this.cluterId).subscribe(result => {
           console.log(result);
           this.cluster = result;
+          if(this.cluster.domainNames !== undefined && this.cluster.domainNames !== null && this.cluster.domainNames.length > 0) {
+            this.selectedDomain = this.cluster.domainNames[0];
+          }
         } )
     })
   }