diff --git a/include/admin/groups.inc.php b/include/admin/groups.inc.php
index 497b6535..4fe8fa25 100644
--- a/include/admin/groups.inc.php
+++ b/include/admin/groups.inc.php
@@ -48,7 +48,7 @@ if ( $serendipity['GET']['adminAction'] != 'delete' ) {
         $groups = array();
     }
     $data['groups'] = $groups;
-    if ( !isset($_POST['NEW']) ) {
+    if ( ! (isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') ) {
         $data['start'] = true;
     }
     $data['deleteFormToken'] = serendipity_setFormToken('url'); 
@@ -57,8 +57,8 @@ if ( $serendipity['GET']['adminAction'] != 'delete' ) {
 
 
 
-if ($serendipity['GET']['adminAction'] == 'edit' || isset($_POST['NEW'])) {
-    if (isset($_POST['NEW'])) {
+if ($serendipity['GET']['adminAction'] == 'edit' || isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') {
+    if (isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') {
         $data['new'] = true;
     } else {
         $data['edit'] = true;
diff --git a/include/admin/users.inc.php b/include/admin/users.inc.php
index a00d601f..477ffdc9 100644
--- a/include/admin/users.inc.php
+++ b/include/admin/users.inc.php
@@ -191,13 +191,13 @@ if ($serendipity['GET']['adminAction'] != 'delete') {
         }
     }
        
-    if ( !isset($_POST['NEW']) && serendipity_checkPermission('adminUsersCreateNew')) {
+    if ( ! (isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') && serendipity_checkPermission('adminUsersCreateNew')) {
         $data['new'] = true;
     }
 }
 
 
-if ( ($serendipity['GET']['adminAction'] == 'edit' && serendipity_checkPermission('adminUsersDelete')) || (isset($_POST['NEW']) && serendipity_checkPermission('adminUsersCreateNew')) ) {
+if ( ($serendipity['GET']['adminAction'] == 'edit' && serendipity_checkPermission('adminUsersDelete')) || ((isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new')  && serendipity_checkPermission('adminUsersCreateNew')) ) {
     $data['adminAction'] = $serendipity['GET']['adminAction'];
     $data['show_form'] = true;
     $data['formToken'] = serendipity_setFormToken();