diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index a933f95a..734a936e 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1599,12 +1599,13 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		error($config['error']['404']);
 	
 	if (isset($_POST['name'], $_POST['email'], $_POST['subject'], $_POST['body'])) {
+		$trip = isset($_POST['remove_trip']) ? ' `trip` = NULL,' : '';
 		if ($edit_raw_html)
-			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name, `email` = :email, `subject` = :subject, `body` = :body, `body_nomarkup` = :body_nomarkup, `edited_at` = NOW() WHERE `id` = :id', $board));
+			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name,'. $trip .' `email` = :email, `subject` = :subject, `body` = :body, `body_nomarkup` = :body_nomarkup, `edited_at` = NOW() WHERE `id` = :id', $board));
 		else
-			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name, `email` = :email, `subject` = :subject, `body_nomarkup` = :body, `edited_at` = NOW() WHERE `id` = :id', $board));
+			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name,'. $trip .' `email` = :email, `subject` = :subject, `body_nomarkup` = :body, `edited_at` = NOW() WHERE `id` = :id', $board));
 		$query->bindValue(':id', $postID);
-		$query->bindValue('name', $_POST['name']);
+		$query->bindValue(':name', $_POST['name'] ? $_POST['name'] : $config['anonymous']);
 		$query->bindValue(':email', $_POST['email']);
 		$query->bindValue(':subject', $_POST['subject']);
 		$query->bindValue(':body', $_POST['body']);
diff --git a/templates/mod/edit_post_form.html b/templates/mod/edit_post_form.html
index a2980d35..09dc3fcd 100644
--- a/templates/mod/edit_post_form.html
+++ b/templates/mod/edit_post_form.html
@@ -10,6 +10,14 @@
 				<input type="text" name="name" size="25" maxlength="35" autocomplete="off" value="{{ post.name }}">
 			</td>
 		</tr>
+		<tr>
+			<th>
+				{% trans %}Tripcode{% endtrans %}
+			</th>
+			<td>
+				Remove? <input type="checkbox" name="remove_trip" value="{{ post.trip }}">
+			</td>
+		</tr>
 		<tr>
 			<th>
 				{% trans %}Email{% endtrans %}