diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 55195fbb7..4b3bf65a6 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -204,7 +204,20 @@ sub processPropertiesFromFormPost {
 	unless ($parameters =~ /alt\=/) {
 		$self->update({parameters=>$parameters.' alt="'.$self->get("title").'"'});
 	}
-	$self->generateThumbnail;
+	my $storage = $self->getStorageLocation;
+	$self->generateThumbnail($session{setting}{maxImageSize});
+	$storage->deleteFile($self->get("filename"));
+	$storage->renameFile('thumb-'.$self->get("filename"),$self->get("filename"));
+	$self->generateThumbnail($session{form}{thumbnailSize});
+}
+
+#-------------------------------------------------------------------
+sub setSize {
+	my $self = shift;
+	my $input = shift;
+	my $storage = $self->getStorageLocation;
+	my $size = ($input > $storage->getFileSize($self->get("filename"))) ? $input : $storage->getFileSize($self->get("filename"));
+	return $self->SUPER::setSize($size);
 }
 
 #-------------------------------------------------------------------
@@ -218,8 +231,6 @@ sub view {
 	return $self->processTemplate(\%var,$self->get("templateId"));
 }
 
-
-
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;