diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index cdbe4cf8d..e94a526b9 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -1,4 +1,5 @@
 <div class="contextual" style="padding-right: 10px;">
+	<%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
 	<%= call_hook(:view_my_account_contextual, :user => @user)%>
 </div>
 
@@ -51,24 +52,7 @@
 		<% end %>
 		<%= call_hook(:view_my_account, :user => @user, :form => f) %>
 	</fieldset>
-    <!--Added by young-->
-    <div>
-    <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
-    <legend onclick="toggleFieldset(this);">
-  	<%=l(:label_authentication)%></legend> <!-- add by huang -->
-	<div>
- 	<p  style="width:400px;padding-left: 26px;"><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
-	<%= password_field_tag 'password', nil, :size => 25 %></p>
-
-	<p  style="width:400px;padding-left: 13px;"><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-	<%= password_field_tag 'new_password', nil, :size => 25 %>
-	<em class="info"  style="width:400px;padding-left: 52px;"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
-
-	<p  style="width:400px;padding-left: 26px;"><label for="new_password_confirmation"><%=l(:field_password_confirmation)%><span class="required">*</span></label>
-	<%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
-	</div>
-	</fieldset>
-    <!--Ended by young-->
+ 
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
 			<%= l(:field_mail_notification)%>