diff --git a/app/controllers/panel/users_controller.rb b/app/controllers/panel/users_controller.rb
index 1a0123b2..4fd14c49 100644
--- a/app/controllers/panel/users_controller.rb
+++ b/app/controllers/panel/users_controller.rb
@@ -13,6 +13,7 @@ class Panel::UsersController < ApplicationController
   
   def new
     @user = User.new
+    @user_attributes = UserAttribute.all
   end
   
   def create
@@ -26,6 +27,7 @@ class Panel::UsersController < ApplicationController
   
   def edit
     @user = User.find(params[:id])
+    @user_attributes = UserAttribute.all
   end
   
   def update
diff --git a/app/models/user.rb b/app/models/user.rb
index 3cd89648..478f2588 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,6 +3,16 @@ class User
  
   devise :authenticatable, :recoverable, :rememberable, :trackable
   
-  key :use_attributes
-    
+  # key :use_attributes
+  
+  def method_missing(method)
+    safe_read(method)
+  end
+  
+  def safe_read(key)
+    self[key]
+    rescue MongoMapper::KeyNotFound
+      return ""
+  end
+  
 end
\ No newline at end of file
diff --git a/app/models/user_attribute.rb b/app/models/user_attribute.rb
index 92e8aba3..005dfecf 100644
--- a/app/models/user_attribute.rb
+++ b/app/models/user_attribute.rb
@@ -2,7 +2,7 @@ class UserAttribute
   
   include MongoMapper::Document
   
-  key :ident, String
+  key :key, String
   key_i18n :name, String
   key_i18n :attrs, Array
   
diff --git a/app/views/panel/users/_form.html.erb b/app/views/panel/users/_form.html.erb
index 65a98419..1be9e60e 100644
--- a/app/views/panel/users/_form.html.erb
+++ b/app/views/panel/users/_form.html.erb
@@ -1,7 +1,13 @@
-<p>
-    <%= label_tag :name %>
-    <%= text_field_tag "user[name]" %>
-</p>
+<% @user_attributes.each do |ua| %>
+    <h3><%= ua.name %></h3>
+    
+    <% ua.attrs.each do |attr|  %>
+    <p>
+        <%= f.label attr["name"] %>
+        <%= f.send(attr["type"], "#{ua.key}_#{attr["key"]}" )%>
+    </p>
+    <% end -%>
+<% end -%>
 
 <p>
     <%= f.label :email %>
diff --git a/app/views/panel/users/index.html.erb b/app/views/panel/users/index.html.erb
index 0065539a..9187c6e7 100644
--- a/app/views/panel/users/index.html.erb
+++ b/app/views/panel/users/index.html.erb
@@ -17,7 +17,7 @@
 <% @users.each do |user| %>
 <tr>
     <td><%= user.use_attributes.join(",") %></td>
-    <td><%#= user.name %></td>
+    <td><%= user.name %></td>
     <td><%= user.email %></td>
     <td>
         <%= link_to 'Show', panel_user_path(user) %>
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 71809b86..5069986c 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -2,11 +2,14 @@ namespace :dev do
   
   task :build => :environment do
     User.delete_all
+    UserAttribute.delete_all
+    
     User.create!( :email => 'ihower@rulingcom.com', :password => 'password', :password_confirmation => 'password', :use_attributes => ["teacher"] )
     
-    UserAttribute.create!( :ident => "teacher", :name => "Teacher", :attrs => [ "name"  => { :type => 'text_field', :width => 100 }, 
-                                                           "title" => { :type => 'text_field', :width => 100 } ] )
-    
+    UserAttribute.create!( :key => "teacher", :name => "Teacher", :attrs => [ { :name => "Name", :key => "name", :type => "text_field" }, { :name => "Title", :key => "title", :type => 'text_field' } ] )
+
+    UserAttribute.create!( :key => "staff", :name => "Staff", :attrs => [ { :name => "Name", :key => "name", :type => "text_field" }, { :name => "Duty", :key => "duty", :type => 'text_field' } ] )
+        
     [Announcement, Item, Snippet, Layout].each { |m| m.delete_all }
       Layout.create!( :name => 'root', :description => 'root', :content_zh_tw => File.open("#{RAILS_ROOT}/lib/template/root.layout.zh_tw").read,
                                       :content_en => File.open("#{RAILS_ROOT}/lib/template/root.layout.en").read)