diff --git a/Changelog b/Changelog
index 9c3adf710..ef6d2877e 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2017-03-22 DariusIII
+	* Fix: Fix empty groups list when selecting active/inactive groups
 2017-03-21 DariusIII
 	* Chg: Add jquery-goup script to composer
 	* Chg: Update forums with coloured roles
diff --git a/nntmux/Groups.php b/nntmux/Groups.php
index cf5714f34..103bdf241 100755
--- a/nntmux/Groups.php
+++ b/nntmux/Groups.php
@@ -216,7 +216,7 @@ class Groups
 					)
 					: ''
 				),
-				($active > -1 ? 'AND g.active = {$active}' : '')
+				($active > -1 ? sprintf('AND g.active = %d', $active) : '')
 			), true, NN_CACHE_EXPIRY_MEDIUM
 		);
 
@@ -253,8 +253,8 @@ class Groups
 					)
 					: ''
 				),
-				($active > -1 ? 'AND g.active = {$active}' : ''),
-				($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
+				$active > -1 ? sprintf('AND g.active = %d', $active) : '',
+				$start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start
 			), true, NN_CACHE_EXPIRY_SHORT
 		);
 	}
diff --git a/www/admin/group-list-active.php b/www/admin/group-list-active.php
index bd271cc71..dce5a8c88 100644
--- a/www/admin/group-list-active.php
+++ b/www/admin/group-list-active.php
@@ -7,31 +7,31 @@ use nntmux\Groups;
 $page = new AdminPage();
 $groups = new Groups(['Settings' => $page->settings]);
 
-$gname = "";
-if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
+$gname = '';
+if (!empty($_REQUEST['groupname'])) {
 	$gname = $_REQUEST['groupname'];
 }
 
 $groupcount = $groups->getCount($gname, 1);
 
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
+$offset = $_REQUEST['offset'] ?? 0;
+$groupname = !empty($_REQUEST['groupname']) ? $_REQUEST['groupname'] : '';
 
 $page->smarty->assign('groupname',$groupname);
 $page->smarty->assign('pagertotalitems',$groupcount);
 $page->smarty->assign('pageroffset',$offset);
 $page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
 
-$groupsearch = ($gname != "") ? 'groupname='.$gname.'&' : '';
-$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list-active.php?".$groupsearch."offset=");
-$pager = $page->smarty->fetch("pager.tpl");
+$groupsearch = $gname != '' ? 'groupname='.$gname.'&' : '';
+$page->smarty->assign('pagerquerybase', WWW_TOP.'/group-list-active.php?'.$groupsearch.'offset=');
+$pager = $page->smarty->fetch('pager.tpl');
 $page->smarty->assign('pager', $pager);
 
 $grouplist = $groups->getRange($offset, ITEMS_PER_PAGE, $gname, 1);
 
 $page->smarty->assign('grouplist',$grouplist);
 
-$page->title = "Group List";
+$page->title = 'Group List';
 
 $page->content = $page->smarty->fetch('group-list.tpl');
 $page->render();
diff --git a/www/admin/group-list-inactive.php b/www/admin/group-list-inactive.php
index 985425a63..71b4e23f0 100644
--- a/www/admin/group-list-inactive.php
+++ b/www/admin/group-list-inactive.php
@@ -7,31 +7,31 @@ use nntmux\Groups;
 $page = new AdminPage();
 $groups = new Groups(['Settings' => $page->settings]);
 
-$gname = "";
-if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
+$gname = '';
+if (!empty($_REQUEST['groupname'])) {
 	$gname = $_REQUEST['groupname'];
 }
 
 $groupcount = $groups->getCount($gname, 0);
 
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
+$offset = $_REQUEST['offset'] ?? 0;
+$groupname = !empty($_REQUEST['groupname']) ? $_REQUEST['groupname'] : '';
 
 $page->smarty->assign('groupname',$groupname);
 $page->smarty->assign('pagertotalitems',$groupcount);
 $page->smarty->assign('pageroffset',$offset);
 $page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
 
-$groupsearch = ($gname != "") ? 'groupname='.$gname.'&' : '';
-$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list-inactive.php?".$groupsearch."offset=");
-$pager = $page->smarty->fetch("pager.tpl");
+$groupsearch = $gname != '' ? 'groupname='.$gname.'&' : '';
+$page->smarty->assign('pagerquerybase', WWW_TOP.'/group-list-inactive.php?'.$groupsearch.'offset=');
+$pager = $page->smarty->fetch('pager.tpl');
 $page->smarty->assign('pager', $pager);
 
 $grouplist = $groups->getRange($offset, ITEMS_PER_PAGE, $gname, 0);
 
 $page->smarty->assign('grouplist',$grouplist);
 
-$page->title = "Group List";
+$page->title = 'Group List';
 
 $page->content = $page->smarty->fetch('group-list.tpl');
 $page->render();