diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 55014991f..29a83af70 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -39,6 +39,7 @@
  - fix: Activity list expands outside of edit workflow screen
  - fix: Thread layout "flat" doesn't stick
  - fix: Rich Edit omitting rows drops subsequent rows
+ - fix: Phishing Bug... take that spammers!
 
 7.1.4
  - Template variables in the main Survey Template were out of date in the
diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm
index cc7bde672..216f0490b 100644
--- a/lib/WebGUI/Form/Image.pm
+++ b/lib/WebGUI/Form/Image.pm
@@ -139,7 +139,13 @@ sub getValueFromPost {
 		my $storage = WebGUI::Storage::Image->get($self->session, $id);
 		if (defined $storage) {
 			foreach my $file (@{$storage->getFiles}) {
-				$storage->generateThumbnail($file) if ($storage->isImage($file));
+				if ($storage->isImage($file)) {
+					$storage->generateThumbnail($file);
+				}
+				else {
+					$storage->delete;
+					$id = undef;
+				}
 			}
 		}
 	}