diff --git a/tcms/rpc/api/testexecution.py b/tcms/rpc/api/testexecution.py
index 9c79bf48d2..fb408d7473 100644
--- a/tcms/rpc/api/testexecution.py
+++ b/tcms/rpc/api/testexecution.py
@@ -225,6 +225,7 @@ def add_link(values, update_tracker=False):
     tracker = tracker_from_url(link.url)
 
     if (link.is_defect and
+            tracker is not None and
             update_tracker and
             not tracker.is_adding_testcase_to_issue_disabled()) or \
             isinstance(tracker, KiwiTCMS):
diff --git a/tcms/testruns/static/testruns/js/get.js b/tcms/testruns/static/testruns/js/get.js
index 0dcfd0d0f2..fdc39ba1f0 100644
--- a/tcms/testruns/static/testruns/js/get.js
+++ b/tcms/testruns/static/testruns/js/get.js
@@ -135,7 +135,7 @@ function renderAdditionalInformation(testExecutions, testExecutionCaseIds) {
                 const bugCount = links.filter(link => link.is_defect).length;
                 listGroupItem.find('.test-execution-bugs-count').html(bugCount)
 
-                listGroupItem.find('.add-link-button').on('click', () => addLinkToExecution(testExecution))
+                listGroupItem.find('.add-link-button').click(() => addLinkToExecution(testExecution))
 
                 const ul = listGroupItem.find('.test-execution-hyperlinks')
                 links.forEach(link => ul.append(renderLink(link)))
diff --git a/tcms/testruns/templates/testruns/get.html b/tcms/testruns/templates/testruns/get.html
index 32219b39d5..6393cd7e97 100644
--- a/tcms/testruns/templates/testruns/get.html
+++ b/tcms/testruns/templates/testruns/get.html
@@ -302,7 +302,9 @@ <h4 class="modal-title" id="add-hyperlink-modal-title">{% trans "Add hyperlink"
           </div>
           <div class="form-group">
             <label class="col-md-3 col-lg-3 col-sm-3 control-label" for="defectCheckbox">{% trans "Is a defect" %}</label>
-            <input class="col-md-9 col-lg-9 col-sm-9 bootstrap-switch" type="checkbox" id="defectCheckbox" data-on-text="{% trans 'Yes' %}" data-off-text="{% trans 'No' %}"/>
+            <div class="col-md-3 col-lg-3">
+                <input class="bootstrap-switch" type="checkbox" id="defectCheckbox" data-on-text="{% trans 'Yes' %}" data-off-text="{% trans 'No' %}"/>
+            </div>
           </div>
         </div>
         <div class="modal-footer">