diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ee87251a6d..a5125c4913 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -207,7 +207,7 @@ function make_forum_box($box_name, $default_forum = -1)
 			$boxstring .=  "<option value=\"".$forum_rows[$y]['forum_id']."\"";
 			if($forum_rows[$y]['forum_id'] == $default_forum)
 			{
-				$boxstring .= " SELECTED";
+				$boxstring .= " selected=\"selected\"";
 			}
 			$boxstring .= ">$name</option>\n";
 		}
@@ -638,7 +638,7 @@ function language_select($default, $dirname="language/")
 			$filename = str_replace("lang_", "", $file);
 			$filename = str_replace(".$phpEx", "", $filename);
 			$displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename);
-			$selected = (strtolower($default) == strtolower($filename)) ? " selected" : "";
+			$selected = (strtolower($default) == strtolower($filename)) ? " selected=\"selected\"" : "";
 			$lang_select .= "  <option value=\"$filename\"$selected>".ucwords($displayname)."</option>\n";
 		}
 	}
@@ -664,7 +664,7 @@ function template_select($default, $dirname = "templates")
 		{
 			if($file == $default)
 			{
-				$selected = " selected";
+				$selected = " selected=\"selected\"";
 			}
 			$template_select .= "<option value=\"$file\"$selected>$file</option>\n";
 		}
@@ -695,7 +695,7 @@ function theme_select($default)
 			{
 				if(stripslashes($rowset[$i]['themes_name']) == $default || $rowset[$i]['themes_id'] == $default)
 				{
-					$selected = " selected";
+					$selected = " selected=\"selected\"";
 				}
 				else
 				{
@@ -730,10 +730,10 @@ function tz_select($default)
 			"-11" => "(GMT -11:00 hours) Midway Island, Samoa",
 			"-10" => "(GMT -10:00 hours) Hawaii",
 			"-9" => "(GMT -9:00 hours) Alaska",
-			"-8" => "(GMT -8:00 hours) Pacific Time (US & Canada)",
-			"-7" => "(GMT -7:00 hours) Mountain Time (US & Canada)",
-			"-6" => "(GMT -6:00 hours) Central Time (US & Canada), Mexico City",
-			"-5" => "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito",
+			"-8" => "(GMT -8:00 hours) Pacific Time (US &amp; Canada)",
+			"-7" => "(GMT -7:00 hours) Mountain Time (US &amp; Canada)",
+			"-6" => "(GMT -6:00 hours) Central Time (US &amp; Canada), Mexico City",
+			"-5" => "(GMT -5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito",
 			"-4" => "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz",
 			"-3.5" => "(GMT -3:30 hours) Newfoundland",
 			"-3" => "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown",
@@ -759,7 +759,7 @@ function tz_select($default)
 
 	while(list($offset, $zone) = each($tz_array))
 	{
-		$selected = ($offset == $default) ? " selected" : "";
+		$selected = ($offset == $default) ? " selected=\"selected\"" : "";
 		$tz_select .= "\t<option value=\"$offset\"$selected>$zone</option>\n";
 	}
 	$tz_select .= "</select>\n";
diff --git a/phpBB/profile.php b/phpBB/profile.php
index eeba6a7221..22b05e4705 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -645,7 +645,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			{
 				if($mode == "editprofile")
 				{
-					$sql = "UPDATE " . USERS_TABLE . "
+					echo $sql = "UPDATE " . USERS_TABLE . "
 						SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify_pm = $notifypm, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_template = '$user_template', user_theme = $user_theme" . $avatar_sql . "
 						WHERE user_id = $user_id";
 
diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl
index 2c5b30afd8..8dadf4fe3d 100644
--- a/phpBB/templates/PSO/profile_add_body.tpl
+++ b/phpBB/templates/PSO/profile_add_body.tpl
@@ -12,55 +12,55 @@
 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
 			</tr>
 			<tr>
-				<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *<br />{L_USER_UNIQ}</td>
-				<td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}"></td>
+				<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
+				<td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" /></td>
 			</tr>
 			<tr>
-				<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</td>
-				<td class="row2"><input type="text" name="email" size="35" maxlength="255" value="{EMAIL}"></td>
+				<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td>
+				<td class="row2"><input type="text" name="email" size="35" maxlength="255" value="{EMAIL}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /><span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
-				<td class="row2"><input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}"></td>
+				<td class="row2"><input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br /><span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td>
-				<td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}"></td>
+				<td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
 			</tr>
 			<tr>
 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
-				<td class="row2"><input type="text" name="icq" size="10" maxlength="15" value="{ICQ}"></td>
+				<td class="row2"><input type="text" name="icq" size="10" maxlength="15" value="{ICQ}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_AIM}:</span></td>
-				<td class="row2"><input type="text" name="aim" size="20" maxlength="255" value="{AIM}"></td>
+				<td class="row2"><input type="text" name="aim" size="20" maxlength="255" value="{AIM}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_MESSENGER}:</span></td>
-				<td class="row2"><input type="text" name="msn" size="20" maxlength="255" value="{MSN}"></td>
+				<td class="row2"><input type="text" name="msn" size="20" maxlength="255" value="{MSN}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_YAHOO}:</span></td>
-				<td class="row2"><input type="text" name="yim" size="20" maxlength="255" value="{YIM}"></td>
+				<td class="row2"><input type="text" name="yim" size="20" maxlength="255" value="{YIM}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_WEBSITE}:</span></td>
-				<td class="row2"><input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}"></td>
+				<td class="row2"><input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_LOCATION}:</span></td>
-				<td class="row2"><input type="text" name="location" size="35" maxlength="100" value="{LOCATION}"></td>
+				<td class="row2"><input type="text" name="location" size="35" maxlength="100" value="{LOCATION}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_OCCUPATION}:</span></td>
-				<td class="row2"><input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}"></td>
+				<td class="row2"><input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_INTERESTS}:</span></td>
-				<td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}"></td>
+				<td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{L_HTML_IS} <u>{HTML_STATUS}</u><br />{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
@@ -71,31 +71,31 @@
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
-				<td class="row2"><input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_HIDE_USER}:</span></td>
-				<td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="hideonline" value="0" {HIDE_USER_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td>
-				<td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
-				<td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td>
-				<td class="row2"><input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td>
-				<td class="row2"><input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td>
-				<td class="row2"><input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_BOARD_LANGUAGE}:</span></td>
@@ -115,7 +115,7 @@
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
-				<td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16"></td>
+				<td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" /></td>
 			</tr>
 			<!-- BEGIN avatarblock -->
 			<tr>
@@ -125,35 +125,35 @@
 				<td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0">
 					<tr>
 						<td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
-						<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel">&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
+						<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
 					</tr>
 				</table></td>
 			</tr>
 			<!-- BEGIN avatarupload -->
 			<tr>
 				<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_FILE}:</span></td>
-				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}"><input type="file" name="avatar"></td>
+				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="avatar" /></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}:</span><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
-				<td class="row2"><input type="text" name="avatarurl" size="40"></td>
+				<td class="row2"><input type="text" name="avatarurl" size="40" /></td>
 			</tr>
 			<!-- END avatarupload -->
 			<!-- BEGIN avatarremote -->
 			<tr>
 				<td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}:</span><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
-				<td class="row2"><input type="text" name="avatarremoteurl" size="40"></td>
+				<td class="row2"><input type="text" name="avatarremoteurl" size="40" /></td>
 			</tr>
 			<!-- END avatarremote -->
 			<!-- BEGIN avatargallery -->
 			<tr>
 				<td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td>
-				<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}"></td>
+				<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" /></td>
 			</tr>
 			<!-- END avatargallery -->
 			<!-- END avatarblock -->
 			<tr>
-			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;&nbsp;<input type="reset" value="{L_RESET}"></td>
+			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
 			</tr>
 		</table></td>
 	</tr>