diff --git a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.html b/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.html
index db340e149107b72842a5f41e11740ae239529665..ff73a9b0a46bb34d13699e2bd7d507c2551de28d 100644
--- a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.html
+++ b/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.html
@@ -62,13 +62,13 @@
                [placeholder]="'admin.organizationalUnit.form.url' | translate"
         >
         <mat-error #errors></mat-error>
-        <button *ngIf="(fd.disabled || fd.valid) && fd.value!=='' && !(fd.value | isNullOrUndefined)"
+        <button *ngIf="(fd.disabled || fd.valid) && fd.value !== '' && !(fd.value | isNullOrUndefined)"
                 matSuffix
                 mat-button
                 mat-icon-button
                 type="button"
-                aria-label="Clear"
-                class="clear"
+                aria-label="Navigate to licence"
+                class="navigate-to-licence"
                 (click)="navigateToOrgUnitUrl(fd)"
         >
           <fa-icon matSuffix
diff --git a/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.html b/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.html
index 0b473b75a2c94c42ba8838927ed145fee0fc1fc5..0ffc8247385b3afe2a80563ea90ce824697e918b 100644
--- a/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.html
+++ b/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.html
@@ -36,8 +36,8 @@
           mat-button
           mat-icon-button
           type="button"
-          aria-label="Clear"
-          class="clear"
+          aria-label="Navigate to"
+          class="navigate-to-url"
           (click)="navigateToUrl($event)"
   >
     <fa-icon matSuffix
diff --git a/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.ts b/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.ts
index 78ed75f43bb5ff2fc4bb9d3976d7ff316e9dafa7..75be9e5db8e8f5af63152568199951a065ec37cf 100644
--- a/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-searchable-single-select/shared-searchable-single-select.presentational.ts
@@ -101,7 +101,7 @@ export class SharedSearchableSingleSelectPresentational<TStateModel extends Reso
   @Input()
   urlKey: string;
 
-  url: string;
+  private url: string;
 
   private _readonly: boolean;
   @Input()
@@ -307,7 +307,7 @@ export class SharedSearchableSingleSelectPresentational<TStateModel extends Reso
   }
 
   isUrlPresent(): boolean {
-    return isNonEmptyString(this.formControl.value);
+    return this.isValuePresent() && !isNullOrUndefined(this.url) && isNonEmptyString(this.url);
   }
 
   clearValue($event: MouseEvent): void {