diff --git a/src/mibew/styles/pages/default/js/group.js b/src/mibew/js/source/group.js
similarity index 83%
rename from src/mibew/styles/pages/default/js/group.js
rename to src/mibew/js/source/group.js
index aa6dc6a8..44bf62f0 100644
--- a/src/mibew/styles/pages/default/js/group.js
+++ b/src/mibew/js/source/group.js
@@ -18,15 +18,15 @@
 
 (function($) {
     function updateParentGroup() {
-        if ($("#parentgroup").val() == '') {
-            $("#extrafields").show();
+        if ($("#parent-group").val() == '') {
+            $("#extra-fields").show();
         } else {
-            $("#extrafields").hide();
+            $("#extra-fields").hide();
         }
     }
 
     $(function() {
-        $("#parentgroup").change(function() {
+        $("#parent-group").change(function() {
             updateParentGroup();
         });
         updateParentGroup();
diff --git a/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php b/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php
index aaf59456..e929f6d0 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php
@@ -96,6 +96,8 @@ class SettingsController extends AbstractController
         $page = array_merge($page, prepare_menu($operator));
         $page['tabs'] = $this->buildTabs($request);
 
+        $this->getAssetManager()->attachJs('js/compiled/group.js');
+
         return $this->render('group_edit', $page);
     }
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars
index 82d4c04f..eebb2f3f 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars
@@ -1,10 +1,6 @@
 {{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
-    {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/group.js"}}"></script>
-    {{/override}}
-
     {{#override "content"}}
         {{#if grid}}
             {{l10n "On this page you can edit group details."}}
@@ -89,19 +85,19 @@
                             </div>
 
                             <div class="field">
-                                <label for="parentgroup" class="flabel">{{l10n "Parent group"}}</label>
+                                <label for="parent-group" class="flabel">{{l10n "Parent group"}}</label>
                                 <div class="fvalue">
-                                    <select name="parentgroup" id="parentgroup">
+                                    <select name="parentgroup" id="parent-group">
                                         {{#each availableParentGroups}}
                                             <option value="{{groupid}}"{{#ifEqual groupid ../formparentgroup}} selected="selected"{{/ifEqual}}>{{#repeat level}}&nbsp;&nbsp;{{/repeat}}{{vclocalname}}</option>
                                         {{/each}}
                                     </select>
                                 </div>
-                                <label for="parentgroup" class="fdescr"> &mdash; {{l10n "Groups can be organized in a hierarchical structure"}}</label>
+                                <label for="parent-group" class="fdescr"> &mdash; {{l10n "Groups can be organized in a hierarchical structure"}}</label>
                                 <br clear="all"/>
                             </div>
 
-                            <div id="extrafields">
+                            <div id="extra-fields">
                                 <div class="fheader">{{l10n "The fields that located below are extra fields. These fields are only available for the top level groups and override corresponding system settings if specified."}}</div>
 
                                 <div class="field">