diff --git a/module/bug/ui/assignto.html.php b/module/bug/ui/assignto.html.php
index e536f55f21..d8a8c42d42 100644
--- a/module/bug/ui/assignto.html.php
+++ b/module/bug/ui/assignto.html.php
@@ -32,11 +32,7 @@ formPanel
     formGroup
     (
         set::label($lang->bug->mailto),
-        set::control('picker'),
-        set::name('mailto[]'),
-        set::value(str_replace(' ', '', $bug->mailto ?: '')),
-        set::items($users),
-        set::multiple(true)
+        mailto(set::items($users), set::value(str_replace(' ', '', $bug->mailto ?: '')))
     ),
     formGroup
     (
diff --git a/module/bug/ui/confirm.html.php b/module/bug/ui/confirm.html.php
index 43e7bc09cf..daf228e103 100644
--- a/module/bug/ui/confirm.html.php
+++ b/module/bug/ui/confirm.html.php
@@ -59,13 +59,7 @@ formPanel
     formGroup
     (
         set::label($lang->bug->lblMailto),
-        picker
-        (
-            set::items($users),
-            set::multiple(true),
-            set::name('mailto[]'),
-            set::value(str_replace(' ', '', $bug->mailto ? $bug->mailto : ''))
-        )
+        mailto(set::items($users), set::value(str_replace(' ', '', $bug->mailto ?: '')))
     ),
     formGroup
     (
diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index 1ddda34083..f6a0395870 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -356,49 +356,7 @@ detailBody
             item
             (
                 set::name($lang->bug->mailto),
-                inputGroup
-                (
-                    picker
-                    (
-                        set::items($users),
-                        set::multiple(true),
-                        set::name('mailto[]'),
-                        set::value($bug->mailto)
-                    ),
-                    span
-                    (
-                        set('id', 'contactBox'),
-                        set('class', 'input-group-addon'),
-                        $contactList ? setStyle(array('width' => '100px', 'padding' => '0')) : null,
-                        $contactList ? picker
-                        (
-                            set::className('width', 'w-20'),
-                            set::name('contactListMenu'),
-                            set::items($contactList),
-                            set::value(),
-                            set::placeholder($lang->contact->common)
-                        ) :
-                        span
-                        (
-                            set('class', 'input-group-addon'),
-                            a
-                            (
-                                set('class', 'mr-2'),
-                                set('href', createLink('my', 'managecontacts', 'listID=0&mode=new')),
-                                set('title', $lang->user->contacts->manage),
-                                set('data-toggle', 'modal'),
-                                icon('cog'),
-                            ),
-                            a
-                            (
-                                set('id', 'refreshMailto'),
-                                set('class', 'text-black'),
-                                set('href', 'javascript:void(0)'),
-                                icon('refresh')
-                            )
-                        )
-                    ),
-                )
+                mailto(set::items($users), set::value($bug->mailto)),
             )
         ),
         tableData