diff --git a/admin/editaccount.php b/admin/editaccount.php
index e1dd69076d..7d5eac4ab7 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -97,8 +97,8 @@
 			'lang_groups'		=> lang('Groups'),
 			'lang_expires'		=> lang('Expires'),
 			'lang_firstname'	=> lang('First Name'),
-			'lang_button'		=> lang('Save'),
-			'lang_file_space'	=> lang('File Space')
+			'lang_button'		=> lang('Save')
+			/* 'lang_file_space'	=> lang('File Space') */
 		);
 		$t->set_var($var);
 		$t->parse('form_buttons','form_buttons_',True);
@@ -120,7 +120,8 @@
 		$_y = $phpgw->sbox->getyears('account_expires_year',$userData['account_expires_year'],date('Y'),date('Y')+10);
 		$_m = $phpgw->sbox->getmonthtext('account_expires_month',$userData['account_expires_month']);
 		$_d = $phpgw->sbox->getdays('account_expires_day',$userData['account_expires_day']);
-		
+
+		/*
 		if (!$userData['file_space'])
 		{
 			$userData['file_space'] = $phpgw_info['server']['vfs_default_account_size_number'] . "-" . $phpgw_info['server']['vfs_default_account_size_type'];
@@ -143,6 +144,7 @@
 		$t->set_var ('lang_file_space', "File space");
 		$t->set_var ('account_file_space', $account_file_space);
 		$t->set_var ('account_file_space_select', $account_file_space_select);
+		*/
 
 		$var = Array(
 			'input_expires'	=> $phpgw->common->dateformatorder($_y,$_m,$_d,True),
@@ -177,7 +179,7 @@
 			$groups_select .= '<option value="' . $value['account_id'] . '"';
 			for ($i=0; $i<count($userGroups); $i++) 
 			{
-				#print "Los1:".$userData["account_id"].$userGroups[$i]['account_id']." : ".$value['account_id']."<br>";
+				/* print "Los1:".$userData["account_id"].$userGroups[$i]['account_id']." : ".$value['account_id']."<br>"; */
 				if ($userGroups[$i]['account_id'] == $value['account_id']) 
 				{
 					$groups_select .= ' selected';
@@ -187,7 +189,7 @@
 		}
 		$groups_select .= '</select>';
 
-		// create list of available apps
+		/* create list of available apps */
 		$i = 0;
 
 		$apps = CreateObject('phpgwapi.applications',$_account_id);
@@ -207,7 +209,7 @@
 			}
 		}
 
-		// create apps output
+		/* create apps output */
 		@reset($db_perms);
 		for ($i=0;$i<count($perm_display);$i++) 
 		{
@@ -262,7 +264,7 @@
 		echo $t->fp('out','form');
 	}
 
-	// stores the userdata
+	/* stores the userdata */
 	function saveUserData($_userData)
 	{
 		global $phpgw;
@@ -312,9 +314,8 @@
 		reset($allGroups);
 		while (list($key,$groupData) = each($allGroups)) 
 		{
-			#print "$key,". $groupData['account_id'] ."<br>";
-
-			#print "$key,". $_userData['account_groups'][1] ."<br>";
+			/* print "$key,". $groupData['account_id'] ."<br>";*/
+			/* print "$key,". $_userData['account_groups'][1] ."<br>"; */
 
 			if ($newGroups[$groupData['account_id']]) 
 			{
@@ -328,9 +329,10 @@
 		$phpgw->session->delete_cache(intval($_userData['account_id']));
 	}
 
-	// checks if the userdata are valid
-	// returns FALSE if the data are correct
-	// otherwise the error array
+	/* checks if the userdata are valid
+	 returns FALSE if the data are correct
+	 otherwise the error array
+	*/
 	function userDataInvalid(&$_userData)
 	{
 		global $phpgw,$phpgw_info;
@@ -387,11 +389,13 @@
 			$_userData['expires'] = -1;
 		}
 
+		/*
 		$check_account_file_space = explode ("-", $_userData['file_space']);
 		if (preg_match ("/\D/", $check_account_file_space[0]))
 		{
 			$error[$totalerrors++] = lang ('File space must be an integer');
 		}
+		*/
 
 		if ($totalerrors == 0)
 		{
@@ -465,8 +469,8 @@
 			'loginshell'            => $loginshell,
 			'account_expires_month' => $account_expires_month,
 			'account_expires_day'   => $account_expires_day,
-			'account_expires_year'  => $account_expires_year,
-			'file_space'	=> $account_file_space_number . "-" . $account_file_space_type
+			'account_expires_year'  => $account_expires_year
+			/* 'file_space'	=> $account_file_space_number . "-" . $account_file_space_type */
 		);
 
 		if (!$errors = userDataInvalid($userData))
@@ -540,7 +544,7 @@
 	}
 
 	$includedSomething = False;
-	// start inlcuding other admin tools
+	// start including other admin tools
 	while($app = each($apps_after))
 	{
 		$phpgw->common->hook_single('show_user_data', $app[0]);
diff --git a/admin/editgroup.php b/admin/editgroup.php
index 51c58d2e94..41a558e92b 100755
--- a/admin/editgroup.php
+++ b/admin/editgroup.php
@@ -74,10 +74,12 @@
 			}
 		}
 
+		/*
 		if (preg_match ("/\D/", $account_file_space_number))
 		{
 			$error = lang ('File space must be an integer');
 		}
+		*/
 
 		if (!$error)
 		{
@@ -269,6 +271,7 @@
 	{
 		$group_repository['file_space'] = $phpgw_info['server']['vfs_default_account_size_number'] . "-" . $phpgw_info['server']['vfs_default_account_size_type'];
 	}
+	/*
 	$file_space_array = explode ("-", $group_repository['file_space']);
 	$account_file_space_number = $file_space_array[0];
 	$account_file_space_type = $file_space_array[1];
@@ -287,7 +290,7 @@
 	$p->set_var ('lang_file_space', "File space");
 	$p->set_var ('account_file_space', $account_file_space);
 	$p->set_var ('account_file_space_select', $account_file_space_select);
-
+	*/
 	$p->set_var('lang_permissions',lang('Permissions this group has'));
 
 	$i = 0;
@@ -342,9 +345,9 @@
 		$perm_html .= '<td colspan="4">&nbsp;</td></tr>';
 	}
 
-	$p->set_var("permissions_list",$perm_html);	
-	$p->set_var("lang_submit_button",lang("submit changes"));
-	$p->pparse("out","form");
+	$p->set_var('permissions_list',$perm_html);	
+	$p->set_var('lang_submit_button',lang('submit changes'));
+	$p->pfp('out','form');
 
 	$phpgw->common->phpgw_footer();
 ?>
diff --git a/admin/newaccount.php b/admin/newaccount.php
index 1054be0cdd..bcd09d1a6e 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -92,10 +92,12 @@
 			$account_expires = -1;
 		}
 
+		/*
 		if (preg_match ("/\D/", $account_file_space_number))
 		{
 			$error[$totalerrors++] = lang ('File space must be an integer');
 		}
+		*/
 
 		if (! $error)
 		{
@@ -115,8 +117,8 @@
 				'account_firstname' => $account_firstname,
 				'account_lastname'  => $account_lastname,
 				'account_status'    => $account_status,
-				'account_expires'   => $account_expires,
-				'account_file_space' => $account_file_space_number . "-" . $account_file_space_type,
+				'account_expires'   => $account_expires
+				/* 'account_file_space' => $account_file_space_number . "-" . $account_file_space_type */
 			);
 			$phpgw->accounts->create($account_info);
 
@@ -288,7 +290,7 @@
 
 	$p->parse('form_buttons','form_buttons_',True);
 
-	// groups list
+	/* groups list */
 	$groups_select = '<select name="account_groups[]" multiple>';
 
 	$groups = $phpgw->accounts->get_list('groups');
@@ -310,8 +312,9 @@
 	}
 	$groups_select .= '</select>';
 	$p->set_var('groups_select',$groups_select);
-	// end groups list
+	/* end groups list */
 
+	/*
 	if (!$account_file_space_number)
 	{
 		$account_file_space_number = $phpgw_info['server']['vfs_default_account_size_number'];
@@ -335,6 +338,7 @@
 	$p->set_var ('lang_file_space', "File space");
 	$p->set_var ('account_file_space', $account_file_space);
 	$p->set_var ('account_file_space_select', $account_file_space_select);
+	*/
 
 	$i = 0;
 	$phpgw->applications->read_installed_apps();
diff --git a/admin/newgroup.php b/admin/newgroup.php
index f6c49cd54b..f97720e6ce 100755
--- a/admin/newgroup.php
+++ b/admin/newgroup.php
@@ -14,7 +14,10 @@
 	$phpgw_info = array();
 	if ($submit)
 	{
-		$phpgw_info['flags'] = array('noheader' => True, 'nonavbar' => True);
+		$phpgw_info['flags'] = array(
+			'noheader' => True,
+			'nonavbar' => True
+		);
 	}
 
 	$phpgw_info['flags']['currentapp'] = 'admin';
@@ -63,10 +66,12 @@
 			$account_expires = -1;
 		}
 
+		/*
 		if (preg_match ("/\D/", $account_file_space_number))
 		{
 			$error = lang ('File space must be an integer');
 		}
+		*/
 
 		if (!$error)
 		{
@@ -233,10 +238,11 @@
 	}
 	$account_file_space_select .= '</select>';
 
+	/*
 	$p->set_var ('lang_file_space', "File space");
 	$p->set_var ('account_file_space', $account_file_space);
 	$p->set_var ('account_file_space_select', $account_file_space_select);
-
+	*/
 	$p->set_var("lang_permissions",lang("Permissions this group has"));
 
 	$i = 0;
@@ -287,9 +293,9 @@
 		$i++;
 	}
 
-	$p->set_var("permissions_list",$perm_html);	
-	$p->set_var("lang_submit_button",lang("Create Group"));
-	$p->pparse("out","form");
+	$p->set_var('permissions_list',$perm_html);	
+	$p->set_var('lang_submit_button',lang('Create Group'));
+	$p->pfp('out','form');
 
 	$phpgw->common->phpgw_footer();
 ?>