diff --git a/lib/NGCP/Panel/Controller/Domain.pm b/lib/NGCP/Panel/Controller/Domain.pm
index b6102c8fc8..858d6c4cab 100644
--- a/lib/NGCP/Panel/Controller/Domain.pm
+++ b/lib/NGCP/Panel/Controller/Domain.pm
@@ -301,6 +301,10 @@ sub load_preference_list : Private {
         }
     }
     $c->stash(pref_rows => \@dom_prefs);
+
+    my $pref_groups_rs = $c->model('provisioning')->resultset('voip_preference_groups');
+    my @pref_groups = $pref_groups_rs->all;
+    $c->stash(pref_groups => \@pref_groups);
 }
 
 =head1 AUTHOR
diff --git a/share/templates/domain/preferences.tt b/share/templates/domain/preferences.tt
index 8a664e8d0b..7f2aeecdf0 100644
--- a/share/templates/domain/preferences.tt
+++ b/share/templates/domain/preferences.tt
@@ -8,6 +8,7 @@
     helper.edit_preference = edit_preference;
     helper.preference = preference;
     helper.preference_meta = preference_meta;
+    helper.pref_groups = pref_groups;
     helper.form = form;
     helper.domain_id = domain.id;
 
diff --git a/share/templates/helpers/pref_table.tt b/share/templates/helpers/pref_table.tt
index d887f3d82c..bd9c9b364a 100644
--- a/share/templates/helpers/pref_table.tt
+++ b/share/templates/helpers/pref_table.tt
@@ -1,4 +1,8 @@
 <style type="text/css" scoped="scoped">
+body {
+    overflow-y: scroll;
+}
+
 .entry-disabled {
 	text-decoration: line-through;
 }
@@ -13,7 +17,16 @@
 
 <div style="margin-top:10px;"></div>
 
-<table class="table table-bordered table-striped table-highlight table-hover" id="preferences_table">
+<div class="accordion" id="preference_groups">
+[% FOREACH group IN helper.pref_groups %]
+<div class="accordion-group">
+    <div class="accordion-heading">
+        <a class="accordion-toggle" data-toggle="collapse" data-parent="#preference_groups" href="#collapse[% group.id %]">[% group.name %]</a>
+    </div>
+    <div class="accordion-body collapse" id="collapse[% group.id %]">
+    <div class="accordion-inner">
+
+<table class="table table-bordered table-striped table-highlight table-hover" id="preferences_table[% group.id %]">
     <thead>
         <tr>
             [% # one for description -%]
@@ -26,6 +39,7 @@
     </thead>
     <tbody>
         [% FOREACH r IN helper.rows %]
+            [% NEXT IF r.voip_preference_groups_id != group.id %]
             <tr class="sw_action_row">
                 <td>
                     <a href="#" onclick="$.msgbox(
@@ -74,6 +88,25 @@
         [% END %]
     </tbody>
 </table>
+    </div>
+    </div>
+</div>
+[% END %]
+</div>
+
+<script type="text/javascript">
+$(function() {
+  $('#preference_groups').on('shown', function (e) {
+    localStorage.setItem('lastTab', $("#preference_groups .in").attr('id'));
+  });
+
+  //go to the latest tab, if it exists:
+  var lastTab = localStorage.getItem('lastTab');
+  if (lastTab) {
+      $('#'+lastTab).addClass("in");//collapse("show"); collapse does annoying animation
+  }
+});
+</script>
 
 [% IF helper.edit_preference -%]
 <div id="mod_edit" class="modal hide" style="display:block">