diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index 833841c87..33b690607 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -12,6 +12,8 @@ from binascii import b2a_hex, a2b_hex
 import random
 import ConfigParser
 import pam
+from UserManage.forms import UserAddForm, GroupAddFrom
+
 
 
 base_dir = "/opt/jumpserver/"
@@ -165,7 +167,7 @@ def addUser(request):
     """添加用户"""
     jm = PyCrypt(key)
     if request.method == 'GET':
-        return render_to_response('addUser.html', {'user_menu': 'active'},
+        return render_to_response('addUser.html', {'user_menu': 'active', 'form': UserAddForm},
                                   context_instance=RequestContext(request))
     else:
         username = request.POST.get('username')
diff --git a/webroot/AutoSa/UserManage/forms.py b/webroot/AutoSa/UserManage/forms.py
new file mode 100644
index 000000000..3a48c2508
--- /dev/null
+++ b/webroot/AutoSa/UserManage/forms.py
@@ -0,0 +1,31 @@
+# coding: utf-8
+
+from django import forms
+from UserManage.models import Group
+
+
+class GroupAddForm(forms.Form):
+    name = forms.CharField(max_length=30)
+
+
+class UserAddForm(forms.Form):
+    username = forms.CharField(max_length=30,
+                               widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': '用户名'}))
+    password = forms.CharField(max_length=30,
+                               widget=forms.PasswordInput(attrs={'class': 'form-control', 'placeholder': '密码'}))
+    password_again = forms.CharField(max_length=30,
+                                     widget=forms.PasswordInput(
+                                         attrs={'class': 'form-control', 'placeholder': '确认密码'}))
+    key_pass = forms.CharField(max_length=30,
+                               widget=forms.PasswordInput(attrs={'class': 'form-control', 'placeholder': '密钥密码'}))
+    key_pass_again = forms.CharField(max_length=30,
+                                     widget=forms.PasswordInput(
+                                         attrs={'class': 'form-control', 'placeholder': '确认密码'}))
+    name = forms.CharField(max_length=30,
+                           widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': '姓名'}))
+    group = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),
+                                           widget=forms.MultipleChoiceField(attrs={'class': 'form-control'}))
+    is_admin = forms.BooleanField()
+    is_superuser = forms.BooleanField()
+
+
diff --git a/webroot/AutoSa/UserManage/models.py b/webroot/AutoSa/UserManage/models.py
index f597539db..eca612de2 100644
--- a/webroot/AutoSa/UserManage/models.py
+++ b/webroot/AutoSa/UserManage/models.py
@@ -11,6 +11,7 @@ class Group(models.Model):
 class User(models.Model):
     username = models.CharField(max_length=50)
     password = models.CharField(max_length=100)
+    key_pass = models.CharField(max_length=100)
     name = models.CharField(max_length=50)
     group = models.ManyToManyField(Group)
     is_admin = models.BooleanField()
diff --git a/webroot/AutoSa/templates/addUser.html b/webroot/AutoSa/templates/addUser.html
index f52bef438..6caf522a2 100644
--- a/webroot/AutoSa/templates/addUser.html
+++ b/webroot/AutoSa/templates/addUser.html
@@ -3,56 +3,76 @@
     <form class="form-horizontal" role="form" method="post" action="" >
         <fieldset >
             <legend>添加用户</legend>
-            {% if error %}
+            {% if form.errors %}
                 <div class="alert alert-danger">
-                    {{ error }}
+                     Please correct the error{{ form.errors|pluralize }} below.
                 </div>
             {% endif %}
+
             {% if msg %}
                 <div class="alert alert-success">
                     {{ msg }}
                 </div>
             {% endif %}
             <div class="form-group">
-                <label for="username" class="col-sm-2 control-label">用户名<span style="color: red"> *</span></label>
+                {{ form.username.errors }}
+                <label for="id_username" class="col-sm-2 control-label">用户名<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="text" class="form-control" id="username" name="username" placeholder="用户名">
+                    {{ form.username }}
                 </div>
             </div>
             <div class="form-group">
-                <label for="password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
+                {{ form.password.errors }}
+                <label for="id_password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password" name="password" placeholder="密码">
+                    {{ form.password }}
                 </div>
             </div>
             <div class="form-group">
-                <label for="password_confirm" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
+                {{ form.password_again.errors }}
+                <label for="id_password_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" class="form-control" id="password_confirm" name="password_confirm" placeholder="确认密码">
+                    {{ form.password_again }}
                 </div>
             </div>
             <div class="form-group">
-                <label for="keypass" class="col-sm-2 control-label">Key密码<span style="color: red"> *</span></label>
+                {{ form.key_pass.errors }}
+                <label for="id_keypass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" class="form-control" id="keypass" name="keypass" placeholder="Key密码">
+                    {{ form.key_pass }}
                 </div>
             </div>
             <div class="form-group">
-                <label for="keypass_confirm" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
+                {{ form.key_pass_again.errors }}
+                <label for="id_keypass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" class="form-control" id="keypass_confirm" name="keypass_confirm" placeholder="确认密码">
+                    {{ form.key_pass_again }}
                 </div>
             </div>
             <div class="form-group">
-                <label for="name" class="col-sm-2 control-label">姓名<span style="color: red"> *</span></label>
+                {{ form.name.errors }}
+                <label for="id_name" class="col-sm-2 control-label">姓名<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="text" class="form-control" id="name" name='name' placeholder="姓名">
+                    {{ form.name }}
                 </div>
             </div>
             <div class="form-group">
-                <label for="email" class="col-sm-2 control-label">E-mail</label>
+                {{ form.group.errors }}
+                <label for="id_group" class="col-sm-2 control-label">属组</label>
                 <div class="col-sm-4">
-                    <input type="email" class="form-control" id="email" name="email" placeholder="用户名">
+                    {{ form.group }}
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="id_is_admin" class="col-sm-2 control-label">组admin</label>
+                <div class="col-sm-4">
+                    {{ form.is_admin }}
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="id_is_superuser" class="col-sm-2 control-label">超级admin</label>
+                <div class="col-sm-4">
+                    {{ form.is_superuser }}
                 </div>
             </div>
             <div class="form-group">