diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 6f79fd155..fcd3c86c1 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -11,7 +11,7 @@
 <fieldset class="box" style="margin:10px;">
 	<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
 		<legend onclick="toggleFieldset(this);">
-			<%= "我的头像"%>
+			<%= l(:label_my_photo)%>
 		</legend>
 		<div>
 		<!--upload profiles-->
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index ddc826fa8..287c5f202 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -2,7 +2,15 @@
 
 <div id="user_form">
 <!--[form:user]-->
-<div class="splitcontentleft">
+<div class="splitcontent">
+	<fieldset class="box">
+		<legend><%= l(:label_my_photo)%></legend>
+		<div>
+		<!--upload profiles-->
+			<%= render :partial=> "avatar/avatar_form", :locals=>{source:@user} %>
+		<!--upload-->
+		</div>
+	</fieldset>
 <fieldset class="box tabular">
   <legend><%=l(:label_information_plural)%></legend>
   <p><%= f.text_field :login, :required => true, :size => 25  %></p>
@@ -33,9 +41,7 @@
   <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
   </div>
 </fieldset>
-</div>
 
-<div class="splitcontentright">
 <fieldset class="box">
   <legend><%=l(:field_mail_notification)%></legend>
   <%= render :partial => 'users/mail_notifications' %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7515bdd2d..2b496b27c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -503,6 +503,7 @@ zh:
   label_versions_settings: 显示配置
   label_versions_progress: 完成进度
   label_versions_description: 版本描述
+  label_my_photo: 我的头像
   #end
   label_my_page: 我的工作台
   label_my_account: 我的帐号