diff --git a/index.php b/index.php
index 7de60de..6011be7 100644
--- a/index.php
+++ b/index.php
@@ -90,6 +90,9 @@
 			
 			setcookie('name', $name, 0x7FFFFFFF);
 			$_COOKIE['name'] = $name;
+
+			setcookie('email', $email, 0x7FFFFFFF);
+			$_COOKIE['email'] = $email;
 		}
 
 		// Validate and move the uploaded image file, if necessary
@@ -532,7 +535,7 @@
 					
 					<label for="email">Email:</label> (Optional)
 					<br />
-					<input id="email" name="email" value="<?php echo htmlspecialchars($email); ?>" />
+					<input id="email" name="email" value="<?php echo htmlspecialchars($email ? : $_COOKIE['email']); ?>" />
 					<br />
 					<br />
 					
@@ -564,7 +567,7 @@
 						</tr>
 						<tr>
 							<td><label for="email">Email:</label></td>
-							<td><input id="email" name="email" value="<?php echo htmlspecialchars($email); ?>" /> (Optional)</td>
+							<td><input id="email" name="email" value="<?php echo htmlspecialchars($email ? : $_COOKIE['email']); ?>" /> (Optional)</td>
 						</tr>
 						<tr>
 							<td><label for="comment">Comment:</label></td>