diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 085ee0c60..c05d1172c 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -102,7 +102,14 @@ class AccountController < ApplicationController
   # User self-registration
   def register
     # @root_path="/home/pdl/redmine-2.3.2-0/apache2/"
-#    
+#
+    @cache_identityy = params[:identity]||""                 #身份
+    @cache_no = params[:no]||""                              #学号
+    @cache_technical_title = params[:technical_title]||""    #教师职称
+    @cache_province = params[:province]||""                  #省份
+    @cache_city = params[:city]||""                          #城市
+    @cache_enterprise_name =  params[:enterprise_name]||""   #企业
+
     (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
     if request.get?
       session[:auth_source_registration] = nil
@@ -112,8 +119,8 @@ class AccountController < ApplicationController
       @user = User.new
       @user.safe_attributes = user_params
       if params[:identity] == "2" #   2 企业
-        @user.firstname = params[:enterprise_name]
-        @user.lastname = l(:field_enterprise)
+        #@user.firstname = params[:enterprise_name]
+        #@user.lastname = l(:field_enterprise)
       end
       @user.admin = false
       @user.register
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 260d53744..21c8c11b9 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -193,7 +193,40 @@
 </script>
 
 <script type="text/javascript" language="javascript">
+
+    window.onload = function(){
+        var identity = "<%= @cache_identityy %>";
+        var no = "<%= @cache_no %>";
+        var technical_title = "<%= @cache_technical_title %>";
+        var province = "<%= @cache_province %>";
+        var city = "<%= @cache_city %>";
+        var enterprise_name = "<%= @cache_enterprise_name %>";
+        //还原身份
+        if(identity!=null&&identity!=""){
+            $('#userIdentity').children("option[value='"+identity+"']").attr("selected","selected");
+            showtechnical_title(identity, document.getElementById('userTechnical_title'));
+            if(identity=="0"){
+                //还原教师职称
+                $('#userTechnical_title').children("option[value='"+technical_title+"']").attr("selected","selected");
+            }else if(identity=="1"){
+               //还原学号
+               $("input[id='no']").attr("value",no);
+            }
+        }
+        //还原地区
+        if(province!=null&&province!=""){
+            $("#userProvince").children("option[value='"+province+"']").attr("selected","selected");
+            showcity(province, document.getElementById('userCity'));
+            $("select[id='userCity']").children("option[value='"+city+"']").attr("selected","selected");
+        }
+        //还原企业名
+        if(enterprise_name!=null&&enterprise_name!=""){
+            $("input[id='enterprise_name']").attr("value",enterprise_name);
+        }
+    }
+
     function showtechnical_title(identity, technical_titleField) {
+        var technical_titleOptions = null;
         switch (identity) {
 
             case '0' :
@@ -202,7 +235,7 @@
                 $('#name').show()
                 $('#enterprise').hide()
                 $('#gender').show()
-                var technical_titleOptions = new Array(
+                technical_titleOptions = new Array(
                         "<%= l(:label_technicl_title_professor) %>", "<%= l(:label_technicl_title_associate_professor) %>", "<%= l(:label_technicl_title_lecturer) %>", "<%= l(:label_technicl_title_teaching_assistant) %>");
                 break;
 
@@ -234,15 +267,20 @@
                 break;
 
         }
+
         technical_titleField.options.length = 0;
+        if(technical_titleOptions == null){
+            return;
+        }
         for (var i = 0; i < technical_titleOptions.length; i++) {
             technical_titleField.options[i] = new Option(technical_titleOptions[i], technical_titleOptions[i]);
-            /*
+             /*
              if (cityField.options[i].value==city)
              {
              //alert("here put City ok!");
              document.oblogform["city"].selectedIndex = i;
-             }*/
+             }
+             */
         }
     }
 </script>