diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 903891c4e..cdbe4cf8d 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -6,7 +6,6 @@
 
 
 
-
 <fieldset class="box" style="margin:10px;">
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
@@ -21,11 +20,12 @@
 	<%= labelled_form_for :user, @user,
 		:url => { :action => "account" },
 		:html => { :id => 'my_account_form',
-		:method => :post } do |f| %>
+		:method => :post } do |f| %>		
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
 			<%= l(:label_information_plural)%>
 		</legend>
+		<div>
 		<p style="width:400px;padding-left: 26px;">
 			<%= f.text_field :firstname, :required => true %>
 		</p>
@@ -41,7 +41,7 @@
 		<% if Setting.openid? %>
 		<p>
 			<%= f.text_field :identity_url  %>
-		</p>
+		</p></div>
 		<% end %>
 
 		<% @user.custom_field_values.select(&:editable?).each do |value| %>
@@ -52,8 +52,11 @@
 		<%= 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><%=l(:label_authentication)%></legend>
+    <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>
 
@@ -61,24 +64,27 @@
 	<%= 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>
+	<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)%>
 		</legend>
+		<div>
 		<p style="width:380px;>
 		<%= render :partial => 'users/mail_notifications' %>
-	    </p>
+	    </p></div>
 	</fieldset>
 
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
 			<%= l(:label_preferences)%>
 		</legend>
-		<%= render :partial => 'users/preferences' %>
+		<div>
+		<%= render :partial => 'users/preferences' %></div>
 	</fieldset>
     <%= submit_tag l(:button_save) %>
 </fieldset>