diff --git a/app/views/artists/_form.html.erb b/app/views/artists/_form.html.erb
index 2f8912e85..5586ac3ae 100644
--- a/app/views/artists/_form.html.erb
+++ b/app/views/artists/_form.html.erb
@@ -1,10 +1,15 @@
 <%= simple_form_for(@artist) do |f| %>
   <div class="input">
     <label for="artist_name">Name</label>
-    <% if @artist.new_record? || CurrentUser.user.is_builder? %>
+    <% if @artist.new_record? %>
       <%= text_field "artist", "name" %>
       [<%= link_to "check", "#", :id => "check-name-link" %>]
       <span id="check-name-result"></span>
+    <% elsif CurrentUser.user.is_builder? %>
+      <%= text_field "artist", "name" %>
+      [<%= link_to "check", "#", :id => "check-name-link" %>]
+      <span id="check-name-result"></span>
+      <span class="hint">Change to rename this artist entry and its wiki page</span>
     <% else %>
       <p><%= @artist.name %></p>
     <% end %>
diff --git a/app/views/wiki_pages/_form.html.erb b/app/views/wiki_pages/_form.html.erb
index d074d358d..7f2f67460 100644
--- a/app/views/wiki_pages/_form.html.erb
+++ b/app/views/wiki_pages/_form.html.erb
@@ -2,9 +2,17 @@
   <%= error_messages_for("wiki_page") %>
 
   <%= simple_form_for(@wiki_page) do |f| %>
-    <% if @wiki_page.new_record? || CurrentUser.user.is_builder? %>
-      <%= f.input :title, :as => :string %>
-    <% end %>
+    <div class="input">
+      <label for="wiki_page_title">Title</label>
+      <% if @wiki_page.new_record? %>
+        <%= text_field "wiki_page", "title" %>
+      <% elsif CurrentUser.user.is_builder? %>
+        <%= text_field "wiki_page", "title" %>
+        <span class="hint">Change to rename this wiki page</span>
+      <% else %>
+        <p><%= @wiki_page.title %></p>
+      <% end %>
+    </div>
 
     <%= f.input :other_names, :as => :text, :label => "Other names (<a href='/wiki_pages/help:translated_tags'>view help</a>)".html_safe, :hint => "Names used for this tag on other sites such as Pixiv. Separate with spaces." %>