--- includes/account.php.original	2006-04-04 13:09:50.000000000 +0200
+++ includes/account.php	2006-04-04 13:40:30.000000000 +0200
@@ -884,23 +884,23 @@
 
 	if($oldid == 13 && $_REQUEST['process'] != "")
 	{
-		$_SESSION['_config']['user']['fname'] = trim(mysql_escape_string(stripslashes($fname)));
-		$_SESSION['_config']['user']['mname'] = trim(mysql_escape_string(stripslashes($mname)));
-		$_SESSION['_config']['user']['lname'] = trim(mysql_escape_string(stripslashes($lname)));
-		$_SESSION['_config']['user']['suffix'] = trim(mysql_escape_string(stripslashes($suffix)));
-		$_SESSION['_config']['user']['day'] = intval($day);
-		$_SESSION['_config']['user']['month'] = intval($month);
-		$_SESSION['_config']['user']['year'] = intval($year);
-		$_SESSION['_config']['user']['Q1'] = trim(mysql_escape_string(stripslashes($Q1)));
-		$_SESSION['_config']['user']['Q2'] = trim(mysql_escape_string(stripslashes($Q2)));
-		$_SESSION['_config']['user']['Q3'] = trim(mysql_escape_string(stripslashes($Q3)));
-		$_SESSION['_config']['user']['Q4'] = trim(mysql_escape_string(stripslashes($Q4)));
-		$_SESSION['_config']['user']['Q5'] = trim(mysql_escape_string(stripslashes($Q5)));
-		$_SESSION['_config']['user']['A1'] = trim(mysql_escape_string(stripslashes($A1)));
-		$_SESSION['_config']['user']['A2'] = trim(mysql_escape_string(stripslashes($A2)));
-		$_SESSION['_config']['user']['A3'] = trim(mysql_escape_string(stripslashes($A3)));
-		$_SESSION['_config']['user']['A4'] = trim(mysql_escape_string(stripslashes($A4)));
-		$_SESSION['_config']['user']['A5'] = trim(mysql_escape_string(stripslashes($A5)));
+		$_SESSION['_config']['user']['fname'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['fname']))));
+		$_SESSION['_config']['user']['mname'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['mname']))));
+		$_SESSION['_config']['user']['lname'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['lname']))));
+		$_SESSION['_config']['user']['suffix'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['suffix']))));
+		$_SESSION['_config']['user']['day'] = intval($_POST['day']);
+		$_SESSION['_config']['user']['month'] = intval($_POST['month']);
+		$_SESSION['_config']['user']['year'] = intval($_POST['year']);
+		$_SESSION['_config']['user']['Q1'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q1']))));
+		$_SESSION['_config']['user']['Q2'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q2']))));
+		$_SESSION['_config']['user']['Q3'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q3']))));
+		$_SESSION['_config']['user']['Q4'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q4']))));
+		$_SESSION['_config']['user']['Q5'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q5']))));
+		$_SESSION['_config']['user']['A1'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A1']))));
+		$_SESSION['_config']['user']['A2'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A2']))));
+		$_SESSION['_config']['user']['A3'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A3']))));
+		$_SESSION['_config']['user']['A4'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A4']))));
+		$_SESSION['_config']['user']['A5'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A5']))));
 
 		if($_SESSION['_config']['user']['Q1'] == "" || $_SESSION['_config']['user']['Q2'] == "" ||
 			$_SESSION['_config']['user']['Q3'] == "" || $_SESSION['_config']['user']['Q4'] == "" ||
@@ -974,9 +974,9 @@
 
 	if($oldid == 14 && $_REQUEST['process'] != "")
 	{
-		$_SESSION['_config']['user']['oldpass'] = trim(mysql_escape_string(stripslashes($oldpassword)));
-		$_SESSION['_config']['user']['pword1'] = trim(mysql_escape_string(stripslashes($pword1)));
-		$_SESSION['_config']['user']['pword2'] = trim(mysql_escape_string(stripslashes($pword2)));
+		$_SESSION['_config']['user']['oldpass'] = trim(mysql_escape_string(stripslashes($_POST['oldpassword'])));
+		$_SESSION['_config']['user']['pword1'] = trim(mysql_escape_string(stripslashes($_POST['pword1'])));
+		$_SESSION['_config']['user']['pword2'] = trim(mysql_escape_string(stripslashes($_POST['pword2'])));
 
 		$id = 14;
 		showheader(_("My CAcert.org Account!"));
--- www/index.php.original	2006-04-04 13:38:45.000000000 +0200
+++ www/index.php	2006-04-04 13:35:15.000000000 +0200
@@ -231,26 +231,26 @@
 
 		$_SESSION['_config']['errmsg'] = "";
 
-		$_SESSION['signup']['email'] = trim(mysql_escape_string(stripslashes($_REQUEST['email'])));
-		$_SESSION['signup']['fname'] = trim(mysql_escape_string(stripslashes($fname)));
-		$_SESSION['signup']['mname'] = trim(mysql_escape_string(stripslashes($mname)));
-		$_SESSION['signup']['lname'] = trim(mysql_escape_string(stripslashes($lname)));
-		$_SESSION['signup']['suffix'] = trim(mysql_escape_string(stripslashes($suffix)));
-		$_SESSION['signup']['day'] = intval($day);
-		$_SESSION['signup']['month'] = intval($month);
-		$_SESSION['signup']['year'] = intval($year);
-		$_SESSION['signup']['pword1'] = trim(mysql_escape_string(stripslashes($pword1)));
-		$_SESSION['signup']['pword2'] = trim(mysql_escape_string(stripslashes($pword2)));
-		$_SESSION['signup']['Q1'] = trim(mysql_escape_string(stripslashes($Q1)));
-		$_SESSION['signup']['Q2'] = trim(mysql_escape_string(stripslashes($Q2)));
-		$_SESSION['signup']['Q3'] = trim(mysql_escape_string(stripslashes($Q3)));
-		$_SESSION['signup']['Q4'] = trim(mysql_escape_string(stripslashes($Q4)));
-		$_SESSION['signup']['Q5'] = trim(mysql_escape_string(stripslashes($Q5)));
-		$_SESSION['signup']['A1'] = trim(mysql_escape_string(stripslashes($A1)));
-		$_SESSION['signup']['A2'] = trim(mysql_escape_string(stripslashes($A2)));
-		$_SESSION['signup']['A3'] = trim(mysql_escape_string(stripslashes($A3)));
-		$_SESSION['signup']['A4'] = trim(mysql_escape_string(stripslashes($A4)));
-		$_SESSION['signup']['A5'] = trim(mysql_escape_string(stripslashes($A5)));
+		$_SESSION['signup']['email'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['email']))));
+		$_SESSION['signup']['fname'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['fname']))));
+		$_SESSION['signup']['mname'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['mname']))));
+		$_SESSION['signup']['lname'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['lname']))));
+		$_SESSION['signup']['suffix'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['suffix']))));
+		$_SESSION['signup']['day'] = intval($_POST['day']);
+		$_SESSION['signup']['month'] = intval($_POST['month']);
+		$_SESSION['signup']['year'] = intval($_POST['year']);
+		$_SESSION['signup']['pword1'] = trim(mysql_escape_string(stripslashes($_POST['pword1'])));
+		$_SESSION['signup']['pword2'] = trim(mysql_escape_string(stripslashes($_POST['pword2'])));
+		$_SESSION['signup']['Q1'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q1']))));
+		$_SESSION['signup']['Q2'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q2']))));
+		$_SESSION['signup']['Q3'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q3']))));
+		$_SESSION['signup']['Q4'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q4']))));
+		$_SESSION['signup']['Q5'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['Q5']))));
+		$_SESSION['signup']['A1'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A1']))));
+		$_SESSION['signup']['A2'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A2']))));
+		$_SESSION['signup']['A3'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A3']))));
+		$_SESSION['signup']['A4'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A4']))));
+		$_SESSION['signup']['A5'] = trim(mysql_escape_string(stripslashes(strip_tags($_POST['A5']))));
 		$_SESSION['signup']['general'] = intval($_POST['general']);
 		$_SESSION['signup']['country'] = intval($_POST['country']);
 		$_SESSION['signup']['regional'] = intval($_POST['regional']);