diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index 0f9b4f7..0c5b0d7 100755
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -17,7 +17,7 @@
                     <input autocomplete="off" spellcheck="false" class="input" type="text" id="i<?= $this->id; ?>"
                         data-emptyAfter="true"
                         data-autocomplete="off"
-                        data-src="api/admin/find/accgrp?search={!#i<?= $this->id; ?>}">
+                        data-src="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/accgrp/find?csrf={$CSRF}'); ?>&search={!#i<?= $this->id; ?>}">
                     <div id="<?= $this->id; ?>-popup" class="popup" data-active="true">
                         <table class="default sticky">
                             <thead>
@@ -41,7 +41,9 @@
                 </div>
             </span>
         </div>
+        <!--
         <div class="ipt-second"><button><?= $this->getHtml('Select', '0', '0'); ?></button></div>
+        -->
     </div>
     <div class="box" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
         <template id="<?= $this->id; ?>-tagTemplate">
diff --git a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
index fb63926..8befb8b 100755
--- a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
@@ -19,7 +19,7 @@
                             "key": 1, "listener": "keyup", "action": [
                                 {"key": 1, "type": "utils.timer", "id": "iSearchAcc", "delay": 500, "resets": true},
                                 {"key": 2, "type": "dom.table.clear", "id": "acc-table"},
-                                {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={!#iSearchAcc}", "method": "GET", "request_type": "json"},
+                                {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/account/find?search={!#iSearchAcc}", "method": "GET", "request_type": "json"},
                                 {"key": 4, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                             ]
                         }
@@ -62,7 +62,7 @@
                             "key": 1, "listener": "keyup", "action": [
                                 {"key": 1, "type": "utils.timer", "id": "iSearchGrp", "delay": 500, "resets": true},
                                 {"key": 2, "type": "dom.table.clear", "id": "grp-table"},
-                                {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={!#iSearchGrp}", "method": "GET", "request_type": "json"},
+                                {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/account/find?search={!#iSearchGrp}", "method": "GET", "request_type": "json"},
                                 {"key": 4, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                             ]
                         }