5 files changed, 9 insertions, 9 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 812bf9b4b..52c2a9e71 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -18,7 +18,7 @@
     </p>
 
     <p class="form_note">
-    <%= link_to "Forgotten your password?", signchange_url + "?pretoken=" + h(params[:token]) %>
+    <%= link_to "Forgotten your password?", signchangepassword_url + "?pretoken=" + h(params[:token]) %>
     </p>
 
     <p class="form_checkbox">
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 46ca8c751..2f9ecbcde 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -50,7 +50,7 @@
         <%= link_to "Send message to " + h(@display_user.name), contact_user_url(:id => @display_user.id) %>
         <% if @is_you %>
             (just to see how it works)
-            <br><%= link_to "Change your password", signchange_url() %>
+            <br><%= link_to "Change your password", signchangepassword_url() %>
         <% end %>
     </p>
 
diff --git a/app/views/user/signchange.rhtml b/app/views/user/signchangepassword.rhtml
index 032d80945..28a63709c 100644
--- a/app/views/user/signchange.rhtml
+++ b/app/views/user/signchangepassword.rhtml
@@ -4,7 +4,7 @@
 
 <div id="change_password">
 
-<% form_tag({:action => "signchange"}, {:id => "signchange_form"}) do %>
+<% form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %>
     <%= foi_error_messages_for :user %>
 
     <div class="form_note">
@@ -22,7 +22,7 @@
     </p>
 
     <div class="form_button">
-    <%= hidden_field_tag 'submitted_signchange_password', 1 %>
+    <%= hidden_field_tag 'submitted_signchangepassword_do', 1 %>
     <%= hidden_field_tag 'pretoken', params[:pretoken] %>
     <%= submit_tag "Change password" %>
     </div>
diff --git a/app/views/user/signchange_confirm.rhtml b/app/views/user/signchangepassword_confirm.rhtml
index baad6729b..baad6729b 100644
--- a/app/views/user/signchange_confirm.rhtml
+++ b/app/views/user/signchangepassword_confirm.rhtml
diff --git a/app/views/user/signchange_send_confirm.rhtml b/app/views/user/signchangepassword_send_confirm.rhtml
index e1462760c..2ff670c34 100644
--- a/app/views/user/signchange_send_confirm.rhtml
+++ b/app/views/user/signchangepassword_send_confirm.rhtml
@@ -2,16 +2,16 @@
 
 <div id="change_password">
 
-<% form_tag({:action => "signchange"}, {:id => "signchange_form"}) do %>
-    <%= foi_error_messages_for :signchange %>
+<% form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %>
+    <%= foi_error_messages_for :signchangepassword %>
 
     <div class="form_note">
     <h1>Change your password</h1>
     </div>
 
     <p>
-    <label class="form_label" for="signchange_email">Your e-mail:</label>
-    <%= text_field 'signchange', 'email', { :size => 20 } %>
+    <label class="form_label" for="signchangepassword_email">Your e-mail:</label>
+    <%= text_field 'signchangepassword', 'email', { :size => 20 } %>
     </p>
 
     <p class="form_note">
@@ -21,7 +21,7 @@
     </p>
 
     <div class="form_button">
-    <%= hidden_field_tag 'submitted_signchange_send_confirm', 1 %>
+    <%= hidden_field_tag 'submitted_signchangepassword_send_confirm', 1 %>
     <%= hidden_field_tag 'pretoken', params[:pretoken] %>
     <%= submit_tag "Submit" %>
     </div>