diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html
index 9d3783cfdf22..0e4889f8c23d 100644
--- a/src/app/knowledge-bases/knowledge-bases.component.html
+++ b/src/app/knowledge-bases/knowledge-bases.component.html
@@ -25,7 +25,8 @@
               GPT-Key
             </button>
             <button class="btn btn-primary" (click)="openAddKnowledgeBaseModal()" [disabled]="addButtonDisabled">
-              {{ 'KbPage.AddKb' | translate }}
+              <!-- {{ 'KbPage.AddKb' | translate }} -->
+              Add your Website
             </button>
           </div>
 
@@ -184,8 +185,11 @@ <h4 class="modal-title">
         <div class="info-container">
           <i class="material-icons-outlined info-icon">help_outline</i>
           <div class="info-text">
-            <p>{{ 'KbPage.AddKbInfoFirstText' | translate }}</p>
-            <p>{{ 'KbPage.AddKbInfoSecondText' | translate }}</p>
+            <!-- <p>{{ 'KbPage.AddKbInfoFirstText' | translate }}</p> -->
+            Set a valid URL for your Website. Tiledesk will search your website URL for relevant answers. ChatGPT will then be trained to reply in a human-like way.
+            Note: You can add a maximum of 3 URLs, each consisting of up to 200 pages. For larger Websites please contact us (sales@tiledesk.com).
+
+            <!-- <p>{{ 'KbPage.AddKbInfoSecondText' | translate }}</p> -->
           </div>
         </div>
 
diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts
index 469c8d6b6856..48c8123d1f87 100644
--- a/src/app/knowledge-bases/knowledge-bases.component.ts
+++ b/src/app/knowledge-bases/knowledge-bases.component.ts
@@ -221,15 +221,29 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
 
   saveKnowledgeBase() {
 
-    let first_index = this.newKb.url.indexOf('://') + 3;
-    let second_index = this.newKb.url.indexOf('www.') + 4;
+    // let first_index = this.newKb.url.indexOf('://') + 3;
+    // let second_index = this.newKb.url.indexOf('www.') + 4;
+    // let split_index;
+    // if (second_index > first_index) {
+    //   split_index = second_index;
+    // } else {
+    //   split_index = first_index;
+    // }
+    // this.newKb.name = this.newKb.url.substring(split_index);
+    let first_index = this.newKb.url.indexOf('://');
+    let second_index = this.newKb.url.indexOf('www.');
+
     let split_index;
-    if (second_index > first_index) {
-      split_index = second_index;
+    if (first_index !== -1 || second_index !== -1) {
+      if (second_index > first_index) {
+        split_index = second_index + 4;
+      } else {
+        split_index = first_index + 3;
+      }
+      this.newKb.name = this.newKb.url.substring(split_index);
     } else {
-      split_index = first_index;
+      this.newKb.name = this.newKb.url;
     }
-    this.newKb.name = this.newKb.url.substring(split_index);
 
     this.kbService.addNewKb(this.kbSettings._id, this.newKb).subscribe((savedSettings: KbSettings) => {
       // console.log('[KNOWLEDGE BASES COMP] this.kbSettings addNewKb ', this.kbSettings)