diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 8bbab794..4011f6f0 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -242,7 +242,14 @@ class WikiController < ApplicationController
     begin
       the_content = params['content']
       filter_spam(the_content)
-      raise Instiki::ValidationError.new('Your content was not valid utf-8.') unless the_content.is_utf8?
+      unless the_content.is_utf8?
+        if @page
+          the_content = @page.content
+        else
+          the_content = ''
+        end 
+        raise Instiki::ValidationError.new('Your content was not valid utf-8.')
+      end
       if @page
         wiki.revise_page(@web_name, @page_name, the_content, Time.now, 
             Author.new(author_name, remote_ip), PageRenderer.new)
@@ -257,9 +264,9 @@ class WikiController < ApplicationController
       logger.error e
       if @page
         @page.unlock
-        redirect_to :action => 'edit', :web => @web_name, :id => @page_name
+        redirect_to :action => 'edit', :web => @web_name, :id => @page_name, :content => the_content
       else
-        redirect_to :action => 'new', :web => @web_name, :id => @page_name
+        redirect_to :action => 'new', :web => @web_name, :id => @page_name, :content => the_content
       end
     end
   end
diff --git a/app/views/wiki/authors.rhtml b/app/views/wiki/authors.rhtml
index 8897ec2e..804e5938 100644
--- a/app/views/wiki/authors.rhtml
+++ b/app/views/wiki/authors.rhtml
@@ -3,7 +3,7 @@
 <ul id="authorList">
   <%- for author in @authors -%>
     <li>
-      <%= link_to_page author.delete("\x01-\x08\x0B\x0C\x0E-\x1F") %>
+      <%= link_to_page author.purify %>
       co- or authored:
       <%= @page_names_by_author[author].collect { |page_name| link_to_page(page_name) }.sort.join ', ' %>
     </li>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index addb1344..6dbaa9bc 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -13,10 +13,10 @@
 	             { 'id' => 'editForm', 'method' => 'post', 'onsubmit' => 'cleanAuthorName()',
 	               'accept-charset' => 'utf-8' }) do %>
 	   <div>	
-		<textarea name="content" id="content" rows="24" cols="60"><%= h(flash[:content] || @page.content.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %></textarea>
+		<textarea name="content" id="content" rows="24" cols="60"><%= h(flash[:content] || (params['content'] || @page.content).purify) %></textarea>
 		<div id="editFormButtons">
 			<input type="submit" value="Submit" accesskey="s"/> as 
-			<%= text_field_tag :author, h(@author.delete("\x01-\x08\x0B\x0C\x0E-\x1F")), 
+			<%= text_field_tag :author, h(@author.purify), 
 			        :onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
 			        :onblur  => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
 			| 
diff --git a/app/views/wiki/locked.rhtml b/app/views/wiki/locked.rhtml
index 9b6cf198..6228c572 100644
--- a/app/views/wiki/locked.rhtml
+++ b/app/views/wiki/locked.rhtml
@@ -1,7 +1,7 @@
 <%- @title = "#{@page.plain_name} is locked" -%>
 
 <p>
-  <%= link_to_page(h(@page.locked_by.delete("\x01-\x08\x0B\x0C\x0E-\x1F"))) %>
+  <%= link_to_page(h(@page.locked_by.purify)) %>
   <%- if @page.lock_duration(Time.now) == 0 -%>
     just started editing this page.
   <%- else -%>
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index c9407700..9e30b32e 100644
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -13,7 +13,7 @@
 	<% form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
 	        { 'id' => 'editForm', 'method' => 'post', 'onsubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) do %>
 	
-	    <textarea name="content" id="content" rows="24" cols="60"><%= h(flash[:content] || '') %></textarea>
+	    <textarea name="content" id="content" rows="24" cols="60"><%= h(flash[:content] || (params['content'] || '').purify ) %></textarea>
 		<div id="editFormButtons">
 		    <input type="submit" value="Submit" accesskey="s"/> as 
 		    <%= text_field_tag :author, @author, 
diff --git a/app/views/wiki/page.rhtml b/app/views/wiki/page.rhtml
index 5a0e1ddf..e276354a 100644
--- a/app/views/wiki/page.rhtml
+++ b/app/views/wiki/page.rhtml
@@ -18,7 +18,7 @@
 
 <div class="byline">
   <%= @page.revisions? ? "Revised" : "Created" %> on <%= format_date(@page.revised_at) %> 
-  by <%= author_link(@page).delete("\x01-\x08\x0B\x0C\x0E-\x1F") %>
+  by <%= author_link(@page).purify %>
   <%= "(#{@page.author.ip})" if @page.author.respond_to?(:ip) %>
   <% if @web.count_pages? %>
     <% total_chars = @page.content.length %>
diff --git a/app/views/wiki/revision.rhtml b/app/views/wiki/revision.rhtml
index 67632430..282f6162 100644
--- a/app/views/wiki/revision.rhtml
+++ b/app/views/wiki/revision.rhtml
@@ -17,7 +17,7 @@
 
 <div class="byline">
   <%= "Revision from #{format_date(@revision.revised_at)} by" %>
-  <%= link_to_page @revision.author.delete("\x01-\x08\x0B\x0C\x0E-\x1F") %>
+  <%= link_to_page @revision.author.purify %>
 </div>
 
 <div class="navigation navfoot">
diff --git a/app/views/wiki/rollback.rhtml b/app/views/wiki/rollback.rhtml
index f5cf77e1..05ddcc01 100644
--- a/app/views/wiki/rollback.rhtml
+++ b/app/views/wiki/rollback.rhtml
@@ -15,10 +15,10 @@
 	      { :id => 'editForm', :method => 'post', :onsubmit => 'cleanAuthorName();', 
 	        'accept-charset' => 'utf-8' }) do %>
 	<div>
-        <textarea name="content" id="content" rows="24" cols="60"><%= h(@revision.content.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %></textarea>
+        <textarea name="content" id="content" rows="24" cols="60"><%= h(@revision.content.purify) %></textarea>
 		<div id="editFormButtons">
 	        <input type="submit" value="Update" accesskey="u" /> as 
-		    <input type="text" name="author" id="authorName" value="<%= h(@author.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %>" 
+		    <input type="text" name="author" id="authorName" value="<%= h(@author.purify) %>" 
 		        onclick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
 		    | 
 			<span>
diff --git a/app/views/wiki/web_list.rhtml b/app/views/wiki/web_list.rhtml
index 9902dd2f..4ba4a523 100644
--- a/app/views/wiki/web_list.rhtml
+++ b/app/views/wiki/web_list.rhtml
@@ -19,7 +19,7 @@
 	- Last Update: <%= web.last_page.nil? ? format_date(web.created_at) : format_date(web.last_page.revised_at) %><br/>
 	<%- if ! web.last_page.nil? -%> 
         Last Document: <%= link_to_page(web.last_page.name,web) %> 
-        <%= web.last_page.revisions? ? "Revised" : "Created" %> by <%= author_link(web.last_page).delete("\x01-\x08\x0B\x0C\x0E-\x1F") %> (<%= web.last_page.current_revision.ip %>)
+        <%= web.last_page.revisions? ? "Revised" : "Created" %> by <%= author_link(web.last_page).purify %> (<%= web.last_page.current_revision.ip %>)
 	<%- end -%>
     </div>
   </div>
diff --git a/lib/stringsupport.rb b/lib/stringsupport.rb
index 7b7dce71..29b7206e 100644
--- a/lib/stringsupport.rb
+++ b/lib/stringsupport.rb
@@ -37,6 +37,9 @@ class String
    end
 #++
 
+  def purify
+    delete("\x01-\x08\x0B\x0C\x0E-\x1F", "\ufffe\uffff") 
+  end
 #:stopdoc: 
   MATHML_ENTITIES = {
 	'Alpha' => '&#x0391;',