diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb
index 6f4de1197..c77c0294e 100644
--- a/app/views/account/email_valid.html.erb
+++ b/app/views/account/email_valid.html.erb
@@ -11,7 +11,7 @@
 <body>
 <% email = @user.mail.split("@")[1] %>
 
-<div style="border: 1px solid #c0c0c0 ;  width:850px;" >
+<div style="border: 1px solid #c0c0c0 ;  width:850px; margin-top: 10px" >
 
   <h3 style=" padding-bottom: 8px; margin-top:5px;  border-bottom: 1px solid #c0c0c0;color:black; ">
     <span  id = "jihuo" style=" margin-left: 4%;"></span>邮箱激活</h3>
@@ -19,9 +19,10 @@
   <div style="margin-left:auto; margin-right:auto">
     <center>
       <div >
-        <h4 style="font-size: 18px;margin-top: 10px; margin-bottom: 10px;">请在24小时内点击邮件中的链接继续完成注册</h4>
-        <div class="to-email">
-          <span class="summary">邮件已发送到邮箱</span>
+        <h4 style="font-size: 18px;margin-top: 10px; padding-bottom: 10px;">请在24小时内点击邮件中的链接继续完成注册</h4>
+        <div class="to-email" style="padding-bottom: 8px; font-size: 14px">
+        <div class="to-email" style="padding-bottom: 8px; font-size: 14px">
+          <span >邮件已发送到邮箱</span>
           <a href="#" class="f-blue"><%= @user.mail %></a>
         </div>
         <p>
@@ -33,12 +34,7 @@
                   padding: 10px 16px;
                   line-height: 1.33;" target="_blank">立即查收邮件</a></p>
              
-              <span class="tracking-ad" >
-              	<a href="javascript:void(0);" >没收到邮件？</a>
-              </span>
-        <div style = "margin-top: 10px; margin-bottom:10px;">
-
-          <span style="font-size: 16px">请先检查是否在垃圾邮件中</span>
+          
 
 
         </div>
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 21bdd8fa7..0bebfdf5f 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -19,7 +19,7 @@
           <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
             <em class="info" style="color: #acaeb1"><%= l(:label_max_number) %></em>
           </p>
-          <p><%= f.password_field :password, :size => 25, :required => true %>
+          <p><%= f.password_field :password, :size => 25, :required => true %><span id="valid_user_password"></span>
             <em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
           </p>
           <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password" style="padding-left: 10px;"></span></p>
@@ -56,10 +56,12 @@
     <p><%= custom_field_tag_with_label :user, value %></p>
 <% end %>
 </div>
+<% password_min_length = Setting.password_min_length %>
 <script type="text/javascript">
     jQuery(document).ready(function () {
         var $login = $('#user_login')
         var $mail = $('#user_mail')
+        var $password = $('#user_password')
         var $password_confirmation = $('#user_password_confirmation')
         $login.blur(function (event) {
             if ($(this).is('#user_login')) {
@@ -92,11 +94,26 @@
                         });
             }
             ;
+        });
+        $password.blur(function () {
+            var pas1 = document.getElementById("user_password").value;
+            var password_min_length = <%= password_min_length %>
+            if (pas1.length >= password_min_length) {
+
+                $('#valid_user_password').html('<span class="green">'+ "</span>");
+            }
+            else {
+                $('#valid_user_password').html('<span class="red">' +  "<%= l(:setting_password_min_length_limit, :count => password_min_length) %>" + "</span>");
+            }
+
+
+
         });
         $password_confirmation.blur(function () {
+            var password_min_length = <%= password_min_length %>
             var pas1 = document.getElementById("user_password").value;
             var pas2 = document.getElementById("user_password_confirmation").value;
-            if (pas1 == pas2) {
+            if (pas1.length >= password_min_length && pas1 == pas2 ) {
                 $('#valid_password').html('<span class="green">' + "<%= l(:setting_password_success) %>"+ "</span>");
             }
             else {
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 04793a02e..277a6eaca 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -106,7 +106,7 @@
     <div>
     <!-- 昵称 -->
     <p style="width:630px;padding-left: 40px;">
-      <%= f.text_field :login, :required => true, :size => 25, :name => "login", :readonly => true %>
+      <%= f.text_field :login, :required => true, :size => 25, :name => "login", :readonly => true, :style =>  'border:1px solid #d3d3d3;'%>
       <span class='font_lighter'><%= l(:label_max_number) %></span>
       <br/>
     </p>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f01a6e6d8..3f4267b76 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -396,7 +396,8 @@ zh:
   setting_repository_log_display_limit: 在文件变更记录页面上显示的最大修订版本数量
   setting_openid: 允许使用OpenID登录和注册
   setting_password_min_length: 最短密码长度
-  setting_password_error: 密码不一致
+  setting_password_min_length_limit: "密码长度至少大于 %{count} 个字符。"
+  setting_password_error: 密码长度不够或密码不一致
   setting_password_success: 密码设置成功
   setting_new_project_user_role_id: 非管理员用户新建项目时将被赋予的（在该项目中的）角色
   setting_default_projects_modules: 新建项目默认启用的模块
@@ -1598,7 +1599,7 @@ zh:
   label_tags_user_mail: 用户邮箱：
   label_tags_user_name: 用户名：
   label_tags_numbers: Tag统计：
-  label_max_number: 登录名是在网站中显示的您的公开标识，只能为英文。
+  label_max_number: 登录名是在网站中显示的您的公开标识，只能为英文和数字。
   label_mail_attention: qq邮箱可能收不到此邮件，其他邮箱如果没有收到可能在垃圾邮件中，
   label_mail_attention1: 其中gmail与教育网邮箱的激活邮件有时比较慢，请耐心等待。
   label_your_course: 您的课程《
