diff --git a/app/views/admin/create_system.rhtml b/app/views/admin/create_system.rhtml
index 2f1cfbdf..f5d5ff7f 100644
--- a/app/views/admin/create_system.rhtml
+++ b/app/views/admin/create_system.rhtml
@@ -6,8 +6,9 @@
   you'll need to do a brief one-time setup.
 </p>
 
-<%= form_tag({ :controller => 'admin', :action => 'create_system'},
-             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'return validateSetup()'})
+<%= form_tag({ :controller => 'admin', :action => 'create_system' },
+             { 'id' => 'setup', 'method' => 'post', 'onSubmit' => 'return validateSetup()', 
+               'accept-charset' => 'utf-8' })
 %>
 <ol class="setup">
   <li>
diff --git a/app/views/admin/create_web.rhtml b/app/views/admin/create_web.rhtml
index e1e72b1d..5b9e3f7e 100644
--- a/app/views/admin/create_web.rhtml
+++ b/app/views/admin/create_web.rhtml
@@ -5,8 +5,10 @@
   so different subjects or projects can write about different <i>MuppetShows</i>.
 </p>
 
-<%= form_tag({ :controller => 'admin', :action => 'create_web'},
-             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+<%= form_tag({ :controller => 'admin', :action => 'create_web' },
+             { 'id' => 'setup', 'method' => 'post', 
+               'onSubmit' => 'cleanAddress(); return validateSetup()',
+               'accept-charset' => 'utf-8' })
 %>
 
 <ol class="setup">
diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index e568a0c6..3062892f 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -1,7 +1,9 @@
 <% @title = "Edit Web" %>
 
 <%= form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
-             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+             { 'id' => 'setup', 'method' => 'post', 
+               'onSubmit' => 'cleanAddress(); return validateSetup()',
+               'accept-charset' => 'utf-8' })
 %>
 
   <h2 style="margin-bottom: 3px">Name and address</h2>
@@ -117,9 +119,9 @@
 <h1>Other administrative tasks</h1>
 
 <%= form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},
-        {:id => 'remove_orphaned_pages', 
-         :onSubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)"
-        })
+        { :id => 'remove_orphaned_pages', 
+          :onSubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)",
+          'accept-charset' => 'utf-8' }) 
 %>
   <p align="right">
     <small>
diff --git a/app/views/file/file.rhtml b/app/views/file/file.rhtml
index 4216a9ed..9f67b9b8 100644
--- a/app/views/file/file.rhtml
+++ b/app/views/file/file.rhtml
@@ -5,7 +5,8 @@
 
 <%= error_messages_for 'file' %>
 
-<%= form_tag({:controller => 'file', :web => @web_name, :action => 'file'}, {:multipart => true}) %>
+<%= form_tag({ :controller => 'file', :web => @web_name, :action => 'file' }, 
+        { 'multipart' => true , 'accept-charset' => 'utf-8' }) %>
   <%= hidden_field 'file', 'file_name' %>
   <div class="inputFieldWithPrompt">
     <b>Content of <%= h @file_name %> to upload <small>(required)</small>:</b>
diff --git a/app/views/file/import.rhtml b/app/views/file/import.rhtml
index e4a01ccb..910ccef4 100644
--- a/app/views/file/import.rhtml
+++ b/app/views/file/import.rhtml
@@ -1,5 +1,5 @@
 <p>
-<%= form_tag({}, {:multipart => true}) %>
+<%= form_tag({}, { 'multipart' => true, 'accept-charset' => 'utf-8' }) %>
   <p>
     File to upload:
     <br/>
diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml
index 45bd413b..5735b472 100644
--- a/app/views/navigation.rhtml
+++ b/app/views/navigation.rhtml
@@ -17,7 +17,7 @@ end
     <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> | 
     <%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %> |
     <%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
-                 {'id' => 'navigationSearchForm', 'method' => 'get'}) %>
+                 {'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) %>
       <input type="text" id="searchField" name="query" value="Search"
              onfocus="this.value == 'Search' ? this.value = '' : true"
              onblur="this.value == '' ? this.value = 'Search' : true" />
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 0c5bb596..6eda2570 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -9,8 +9,9 @@
   <%= render 'wiki_words_help' %>
 </div>
 
-<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name},
-             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()'})
+<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
+             { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()',
+               'accept-charset' => 'utf-8' })
 %>
 
 <p>
diff --git a/app/views/wiki/login.rhtml b/app/views/wiki/login.rhtml
index 1885052e..ca277edc 100644
--- a/app/views/wiki/login.rhtml
+++ b/app/views/wiki/login.rhtml
@@ -2,7 +2,7 @@
 
 <p>
 <%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
-    { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'})
+    { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' })
 %>
     <p>
     This web is password-protected. Please enter the password.
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index 95136007..fe09a91b 100644
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -9,8 +9,9 @@
   <%= render 'wiki_words_help' %>
 </div>
 
-<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name},
-             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})
+<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
+             { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();',
+               'accept-charset' => 'utf-8' })
 %>
 
 <p>
diff --git a/app/views/wiki/rollback.rhtml b/app/views/wiki/rollback.rhtml
index 410cc5d5..82daab5c 100644
--- a/app/views/wiki/rollback.rhtml
+++ b/app/views/wiki/rollback.rhtml
@@ -7,7 +7,8 @@
 <%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
 
 <%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
-      {:id => 'editForm', :method => 'post', :onSubmit => 'cleanAuthorName();'})
+      { :id => 'editForm', :method => 'post', :onSubmit => 'cleanAuthorName();', 
+        'accept-charset' => 'utf-8' })
 %>
 <p>
   <textarea name="content" style="font-size: 12px; width: 450px; height: 500px"><%= @revision.content %></textarea>