diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php
index 817b9c38de..ac84bd3dd9 100644
--- a/admin/inc/class.admin_account.inc.php
+++ b/admin/inc/class.admin_account.inc.php
@@ -154,6 +154,11 @@ class admin_account
 					break;
 			}
 		}
+		// Make sure primary group is in account groups
+		if($account['account_primary_group'] && !array_search($account['account_primary_group'], $account['account_groups']))
+		{
+			$account['account_groups'][] = $account['account_primary_group'];
+		}
 
 		$cmd = new admin_cmd_edit_user((int)$content['account_id'], $account);
 		$cmd->run();