diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index a785c42b3..f709474e2 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -519,17 +519,16 @@ function local_user_get_groups($user, $all = false)
 	global $config;
 
 	$groups = array();
-	if (!is_array($config['system']['group']))
+	if (!is_array($config['system']['group'])) {
 		return $groups;
+	}
 
-	foreach ($config['system']['group'] as $group)
-		if ( $all || ( !$all && ($group['name'] != "all")))
-			if (is_array($group['member']))
-				if (in_array($user['uid'], $group['member']))
-					$groups[] = $group['name'];
-
-	if ($all) {
-		$groups[] = 'all';
+	foreach ($config['system']['group'] as $group) {
+		if (is_array($group['member'])) {
+			if (in_array($user['uid'], $group['member']) || ($group['name'] == "all" && $all)) {
+				$groups[] = $group['name'];
+			}
+		}
 	}
 
 	sort($groups);
@@ -548,28 +547,33 @@ function local_user_set_groups($user, $new_groups = null)
 	$cur_groups = local_user_get_groups($user, true);
 	$mod_groups = array();
 
-	if (!is_array($new_groups))
+	if (!is_array($new_groups)) {
 		$new_groups = array();
+	}
 
-	if (!is_array($cur_groups))
+	if (!is_array($cur_groups)) {
 		$cur_groups = array();
+	}
 
 	/* determine which memberships to add */
 	foreach ($new_groups as $groupname) {
-		if (in_array($groupname,$cur_groups))
+		if (in_array($groupname,$cur_groups) || !isset($groupindex[$groupname])) {
+			// continue if group is already in current list or the groupname is invalid
 			continue;
+		}
 		$group = & $config['system']['group'][$groupindex[$groupname]];
 		$group['member'][] = $user['uid'];
 		$mod_groups[] = $group;
 	}
-	unset($group);
 
 	/* determine which memberships to remove */
 	foreach ($cur_groups as $groupname) {
-		if (in_array($groupname,$new_groups))
+		if (in_array($groupname,$new_groups)) {
 			continue;
-		if (!isset($config['system']['group'][$groupindex[$groupname]]))
+		}
+		if (!isset($config['system']['group'][$groupindex[$groupname]])) {
 			continue;
+		}
 		$group = & $config['system']['group'][$groupindex[$groupname]];
 		if (is_array($group['member'])) {
 			$index = array_search($user['uid'], $group['member']);
@@ -577,11 +581,11 @@ function local_user_set_groups($user, $new_groups = null)
 			$mod_groups[] = $group;
 		}
 	}
-	unset($group);
 
 	/* sync all modified groups */
-	foreach ($mod_groups as $group)
+	foreach ($mod_groups as $group) {
 		local_group_set($group);
+	}
 }
 
 function local_group_del_user($user) {
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 3c76fd24f..4d0e75d84 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -248,21 +248,23 @@ if ($_POST['save']) {
 
 	if (!$input_errors) {
 		$userent = array();
-		if (isset($id) && $a_user[$id])
+		if (isset($id) && $a_user[$id]) {
 			$userent = $a_user[$id];
 
+                        /* the user name was modified */
+                        if ($_POST['usernamefld'] <> $_POST['oldusername']) {
+                            $_SERVER['REMOTE_USER'] = $_POST['usernamefld'];
+                            local_user_del($userent);
+                        }
+
+                        /* the user password was mofified */
+                        if ($_POST['passwordfld1']) {
+                            local_user_set_password($userent, $_POST['passwordfld1']);
+                        }
+                }
+
 		isset($_POST['utype']) ? $userent['scope'] = $_POST['utype'] : $userent['scope'] = "system";
 
-		/* the user name was modified */
-		if ($_POST['usernamefld'] <> $_POST['oldusername']) {
-			$_SERVER['REMOTE_USER'] = $_POST['usernamefld'];
-			local_user_del($userent);
-		}
-
-		/* the user password was mofified */
-		if ($_POST['passwordfld1'])
-			local_user_set_password($userent, $_POST['passwordfld1']);
-
 		$userent['name'] = $_POST['usernamefld'];
 		$userent['descr'] = $_POST['descr'];
 		$userent['expires'] = $_POST['expires'];
@@ -320,10 +322,6 @@ if ($_POST['save']) {
 		local_user_set($userent);
 		write_config();
 
-		//if(is_dir("/usr/local/etc/inc/privhooks"))
-		//	run_plugins("/usr/local/etc/inc/privhooks");
-
-
 		pfSenseHeader("system_usermanager.php");
 	}
 }