diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 655bad5d8f..97553ce321 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -813,6 +813,11 @@ function validate_username($username)
 	return false;
 }
 
+// TODO?
+// Ability to limit types of email address ... not by banning, seperate table
+// capability to require (or deny) use of certain addresses when user is
+// registering from certain IP's/hosts
+
 // Check to see if email address is banned or already present in the DB
 function validate_email($email)
 {
@@ -1224,7 +1229,7 @@ function group_delete($group_id, $group_name = false)
 	return false;
 }
 
-function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = false)
+function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = 0)
 {
 	global $db, $auth;
 
@@ -1347,6 +1352,15 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
 			{
 				trigger_error("Could not obtain group attributes for group_id $group_id", E_USER_ERROR);
 			}
+
+			if (!$group_avatar_width)
+			{
+				unset($group_avatar_width);
+			}
+			if (!$group_avatar_height)
+			{
+				unset($group_avatar_height);
+			}
 		}
 
 		$sql_set = '';
@@ -1601,8 +1615,20 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
 					return 'NO_GROUP';
 				}
 				$db->sql_freeresult($result);
+
+				if (!$group_avatar_width)
+				{
+					unset($group_avatar_width);
+				}
+				if (!$group_avatar_height)
+				{
+					unset($group_avatar_height);
+				}
 			}
 
+			// FAILURE HERE when grabbing data from DB and checking "isset" ... will
+			// be true for all similar functionality
+
 			$sql_set = '';
 			foreach ($attribute_ary as $attribute => $type)
 			{