diff --git a/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.html b/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.html
index 6adf3894e..8d6a650ca 100644
--- a/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.html
+++ b/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.html
@@ -31,20 +31,20 @@
   </div>
   <div class="alert-details w-100 d-flex justify-content-start mb-2 ">
     <span class="text-blue-800 font-weight-light has-minimum-width">Type:</span>&nbsp;
-    <app-assets-apply-type [assets]="[agent.id]" [typeFormat]="'icon'"
+    <app-assets-apply-type *ngIf="asset" [assets]="[agent.id]" [typeFormat]="'icon'"
                            [type]="asset.assetType" class="ml-2">
     </app-assets-apply-type>
   </div>
   <div class="alert-details w-100 d-flex justify-content-start mb-2 ">
     <span class="text-blue-800 font-weight-light has-minimum-width">Group Source:</span>&nbsp;
-    <app-asset-group-add [assets]="[asset.id]"
+    <app-asset-group-add *ngIf="asset" [assets]="[asset.id]"
                          [group]="asset.group"
                          [typeFormat]="'icon'" class="ml-2">
     </app-asset-group-add>
   </div>
   <div class="alert-details w-100 d-flex justify-content-start mb-2 ">
     <span class="text-blue-800 font-weight-light has-minimum-width">Comment:</span>&nbsp;
-    <app-assets-apply-note [asset]="asset" class="ml-2"></app-assets-apply-note>
+    <app-assets-apply-note *ngIf="asset" [asset]="asset" class="ml-2"></app-assets-apply-note>
   </div>
   <div class="agent-details w-100 d-flex justify-content-start mb-2" *ngIf="agent.version">
     <span class="text-blue-800 font-weight-light has-minimum-width">OS Version:</span>&nbsp;
diff --git a/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.html b/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.html
index 5eabd7483..365b269af 100644
--- a/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.html
+++ b/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.html
@@ -6,7 +6,6 @@
            [virtualScroll]="true"
            [searchable]="true"
            [(ngModel)]="agent"
-           bindValue="id"
            id="agentSelector"
            placeholder="Select agent"
            [ngStyle]="{'min-width':'150px'}">
diff --git a/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.ts b/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.ts
index cb6e424eb..61b1f4e9f 100644
--- a/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.ts
+++ b/frontend/src/app/shared/components/utm/util/utm-agent-select/utm-agent-select.component.ts
@@ -12,7 +12,7 @@ export class UtmAgentSelectComponent implements OnInit {
   @Output() agentSelect = new EventEmitter<AgentType>();
   agents: AgentType[];
   agentStatusEnum = AgentStatusEnum;
-  agent: AgentType;
+  agent: any;
 
   constructor(private utmAgentManagerService: UtmAgentManagerService) {
   }
@@ -42,7 +42,7 @@ export class UtmAgentSelectComponent implements OnInit {
 
 
   selectAgent($event: AgentType | any) {
-    this.agent = $event;
+    this.agent = `${$event.hostname} (${$event.os})`;
     this.agentSelect.emit($event);
   }
 }