diff --git a/src/app/helpers/plugin.ts b/src/app/helpers/plugin.ts
index b92a771..b9f00da 100644
--- a/src/app/helpers/plugin.ts
+++ b/src/app/helpers/plugin.ts
@@ -53,7 +53,7 @@ export class Plugin {
                     );
                   } else {
                     // If Component took too long...
-                    if (Date.now() - readyTime > this.delay * 25) {
+                    if (Date.now() - readyTime > this.delay * 5) {
                       // Wait 5 times the default delay
                       alert.componentInstance.data.title =
                         django.gettext('Service ready') +
@@ -65,12 +65,12 @@ export class Plugin {
                           'It seems that you don\'t have UDS Client installed. Please, install it from here: '
                         ) +
                         '</span>' +
-                        '<a href="/client-download">' +
+                        '<a href="' + this.api.config.urls.clientDownload + '">' +
                         django.gettext('UDS Client Download') +
                         '</a>';
                     }
                   }
-                  window.setTimeout(checker, this.delay / 2); // Recheck after delay seconds
+                  window.setTimeout(checker, this.delay); // Recheck after delay seconds
                 } else if (data.status === 'accessed') {
                   alert.componentInstance.data.body = django.gettext(
                     'Machine ready, waiting for UDS Client'
diff --git a/src/app/types/config.ts b/src/app/types/config.ts
index 329f8bf..25c162a 100644
--- a/src/app/types/config.ts
+++ b/src/app/types/config.ts
@@ -28,6 +28,7 @@ export interface UDSUrls {
     readonly action: string;
     readonly galleryImage: string;
     readonly transportIcon: string;
+    readonly clientDownload: string;
 
     readonly launch: string;
 }