  
  $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), pun_htmlspecialchars($cur_topic['forum_name']), pun_htmlspecialchars($cur_topic['subject']));
  define('PUN_ALLOW_INDEX', 1);
+@@ -447,8 +471,8 @@ if ($pun_user['is_guest'])
+ 	$email_form_name = ($pun_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
+ 
+ ?>
+-						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
+-						<label class="conl<?php echo ($pun_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" tabindex="<?php echo $cur_index++ ?>" /><br /></label>
++						<label class="conl required"><strong><?php echo $lang_post['Guest name'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" required /><br /></label>
++						<label class="conl<?php echo ($pun_config['p_force_guest_email'] == '1') ? ' required' : '' ?>"><?php echo $email_label ?><br /><input type="text" name="<?php echo $email_form_name ?>" size="50" maxlength="80" /><br /></label>
+ 						<div class="clearer"></div>
+ <?php
+ 
+@@ -458,7 +482,7 @@ else
+ 	echo "\t\t\t\t\t\t".'<label>';
+ 
+ ?>
+-<textarea name="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
++<textarea name="req_message" rows="7" cols="75" required></textarea></label>
+ 						<ul class="bblinks">
+ 							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+ 							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+@@ -469,7 +493,7 @@ else
+ 				</fieldset>
+ 			</div>
+ <?php flux_hook('quickpost_before_submit') ?>
+-			<p class="buttons"><input type="submit" name="submit" tabindex="<?php echo $cur_index++ ?>" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" tabindex="<?php echo $cur_index++ ?>" accesskey="p" /></p>
++			<p class="buttons"><input type="submit" name="submit" value="<?php echo $lang_common['Submit'] ?>" accesskey="s" /> <input type="submit" name="preview" value="<?php echo $lang_topic['Preview'] ?>" accesskey="p" /></p>
+ 		</form>
+ 	</div>
+ </div>

 
 	$now = time();
 
diff --git a/viewforum.php b/viewforum.php
index 2607a219..6f49847a 100644
--- a/viewforum.php

 
 // Get the forum config
 $result = $db->query('SELECT * FROM '.$db->prefix.'config') or error('Unable to fetch config.', __FILE__, __LINE__, $db->error());
@@ -577,7 +577,7 @@ if (empty($stage))
 					<legend><?php echo $lang_update['Charset conversion'] ?></legend>
 					<div class="infldset">
 						<div class="rbox">
-							<label><input type="checkbox" name="convert_charset" value="1" checked="checked" /><?php echo $lang_update['Enable conversion label'] ?><br /></label>
+							<label><input type="checkbox" name="convert_charset" value="1" checked /><?php echo $lang_update['Enable conversion label'] ?><br /></label>
 						</div>
 						<label>
 							<strong><?php echo $lang_update['Current character set label'] ?></strong><br /><?php echo $lang_update['Current character set info'] ?><br />
diff --git a/edit.php b/edit.php
index d757eeb0..8ed4d1a8 100644
--- a/edit.php
+++ b/edit.php
@@ -113,7 +113,7 @@ if (isset($_POST['form_sent']))
