diff -Nru gnome-system-tools-2.22.2/debian/changelog gnome-system-tools-2.22.2/debian/changelog
--- gnome-system-tools-2.22.2/debian/changelog	2009-04-15 20:32:19.000000000 +0100
+++ gnome-system-tools-2.22.2/debian/changelog	2009-04-15 20:32:20.000000000 +0100
@@ -1,3 +1,12 @@
+gnome-system-tools (2.22.2-0ubuntu4) jaunty; urgency=low
+
+  * Created: 86_disable_admin_user_creation.patch - disables the ability
+    to create an 'admin' user, which, if allowed to happen, would overwrite
+    a previously defined admin group. This would render any system
+    adminstration by sudoers impossible (LP: #236305).
+
+ -- Jonathan Davies <jpds@ubuntu.com>  Wed, 15 Apr 2009 17:56:27 +0100
+
 gnome-system-tools (2.22.2-0ubuntu3) jaunty; urgency=low
 
   * debian/patches/93_polkit_dbus_timeout.patch:
diff -Nru gnome-system-tools-2.22.2/debian/patches/86_disable_admin_user_creation.patch gnome-system-tools-2.22.2/debian/patches/86_disable_admin_user_creation.patch
--- gnome-system-tools-2.22.2/debian/patches/86_disable_admin_user_creation.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-system-tools-2.22.2/debian/patches/86_disable_admin_user_creation.patch	2009-04-15 20:32:20.000000000 +0100
@@ -0,0 +1,14 @@
+--- ./src/users/user-settings.c	2009-04-15 17:34:30.568734918 +0100
++++ ./src/users/user-settings.c	2009-04-15 17:51:13.224083216 +0100
+@@ -482,6 +482,11 @@ check_login (gchar **primary_text, gchar
+ 	} else if (!user && login_exists (login)) {
+ 		*primary_text = g_strdup_printf (_("User name \"%s\" already exists"), login);
+ 		*secondary_text = g_strdup (_("Please select a different user name."));
++	} else if (strcmp(login, "admin") == 0) {
++        	/* Check if the user has entered 'admin' for a user name.
++           	   (https://bugs.launchpad.net/bugs/236305) */
++        	*primary_text = g_strdup_printf(_("Cannot create a user with the user name \"%s\"."), login);
++        	*secondary_text = g_strdup(_("The 'admin' group is reserved for privileged users."));
+ 	}
+ }
+ 
diff -Nru gnome-system-tools-2.22.2/debian/patches/series gnome-system-tools-2.22.2/debian/patches/series
--- gnome-system-tools-2.22.2/debian/patches/series	2009-04-15 20:32:19.000000000 +0100
+++ gnome-system-tools-2.22.2/debian/patches/series	2009-04-15 20:32:20.000000000 +0100
@@ -17,3 +17,4 @@
 92_postgresql_versions.patch
 93_polkit_dbus_timeout.patch
 98_automake.patch
+86_disable_admin_user_creation.patch