diff --git a/tcms/testplans/static/testplans/js/get.js b/tcms/testplans/static/testplans/js/get.js
index 79f66b4962..6f51787fd8 100644
--- a/tcms/testplans/static/testplans/js/get.js
+++ b/tcms/testplans/static/testplans/js/get.js
@@ -26,7 +26,8 @@ export function pageTestplansGetReadyHandler () {
         'perm-remove-testcase': testPlanDataElement.data('perm-remove-testcase') === 'True',
         'perm-add-testcase': testPlanDataElement.data('perm-add-testcase') === 'True',
         'perm-add-comment': testPlanDataElement.data('perm-add-comment') === 'True',
-        'perm-delete-comment': testPlanDataElement.data('perm-delete-comment') === 'True'
+        'perm-delete-comment': testPlanDataElement.data('perm-delete-comment') === 'True',
+        'perm-view-user': testPlanDataElement.data('perm-view-user') === 'True'
     }
 
     // bind everything in tags table
@@ -376,6 +377,26 @@ function attachEvents (testPlanId, permissions) {
         })
     }
 
+    if (permissions['perm-view-user']) {
+        $('#default-tester-input').typeahead({
+            minLength: 3,
+            highlight: true
+        }, {
+            name: 'default-tester-autocomplete',
+            // will display up to X results even if more were returned
+            limit: 100,
+            async: true,
+            display: function (element) {
+                return element.username
+            },
+            source: function (query, processSync, processAsync) {
+                jsonRPC('User.filter', { username__icontains: query }, function (data) {
+                    return processAsync(data)
+                })
+            }
+        })
+    }
+
     // get details and draw expand area only on expand
     $('.js-testcase-row').click(function (ev) {
     // don't trigger row expansion when kebab menu is clicked
@@ -540,23 +561,25 @@ function toolbarEvents (testPlanId, permissions) {
     })
 
     $('#default-tester-button').click(function (ev) {
-        $(this).parents('.dropdown').toggleClass('open')
-        const selectedCases = getSelectedTestCases()
-
-        if (!selectedCases.length) {
+        if (!getSelectedTestCases().length) {
             alert($('#test_plan_pk').data('trans-no-testcases-selected'))
-            return false
+            ev.stopPropagation()
+        } else {
+            $('#default-tester-modal').modal('show')
         }
+        return false
+    })
 
-        const emailOrUsername = window.prompt($('#test_plan_pk').data('trans-username-email-prompt'))
-
-        if (!emailOrUsername) {
-            return false
+    $('.default-tester-form').submit(function (ev) {
+        ev.preventDefault()
+        const selectedCases = getSelectedTestCases()
+        const emailOrUsername = $('#default-tester-input').val()
+        if (emailOrUsername) {
+            updateTestCasesViaAPI(selectedCases, { default_tester: emailOrUsername },
+                testPlanId, permissions)
         }
-
-        updateTestCasesViaAPI(selectedCases, { default_tester: emailOrUsername },
-            testPlanId, permissions)
-
+        $('#default-tester-modal').modal('hide')
+        $('.default-tester-form').trigger('reset')
         return false
     })
 
diff --git a/tcms/testplans/templates/testplans/get.html b/tcms/testplans/templates/testplans/get.html
index df81e70d6d..3a2fd0075d 100644
--- a/tcms/testplans/templates/testplans/get.html
+++ b/tcms/testplans/templates/testplans/get.html
@@ -22,6 +22,7 @@ <h1 class="col-md-12" style="margin-top: 0">
               data-perm-add-testcase="{{ perms.testcases.add_testcase }}"
               data-perm-add-comment="{{ perms.django_comments.add_comment }}"
               data-perm-delete-comment="{{ perms.django_comments.delete_comment }}"
+              data-perm-view-user="{{ perms.auth.view_user }}"
               data-trans-username-email-prompt="{% trans 'Enter username, email or user ID:' %}"
               data-trans-no-testcases-selected="{% trans 'No rows selected! Please select at least one!'%}"
               data-trans-are-you-sure="{% trans 'Are you sure?' %}"
@@ -326,6 +327,32 @@ <h2 class="card-pf-title">
 
 </div>
 
+<div class="modal fade" id="default-tester-modal" tabindex="-1" role="dialog" aria-labelledby="default-tester-modal" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+            <span class="pficon pficon-close"></span>
+          </button>
+          <h4 class="modal-title" id="default-tester-modal-title">{% trans "Default Tester" %}</h4>
+        </div>
+        <form class="form-horizontal default-tester-form">
+          <div class="modal-body">
+            <div class="form-group">
+              <label class="col-sm-5 control-label" for="default-tester">{% trans 'Enter username, email or user ID:' %}</label>
+              <div class="col-sm-6">
+                  <input type="text" name="default-tester" id="default-tester-input" class="form-control">
+              </div>
+            </div>
+          </div>
+          <div class="modal-footer">
+              <button type="button" class="btn btn-danger" data-dismiss="modal">{% trans "Cancel" %}</button>
+              <button type="submit" class="btn btn-primary default-testerk-button">{% trans "Save" %}</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
 <template id="no_test_cases">
     <div class="list-group-item">
         <div class="list-group-item-header">