diff --git a/wscacicneo/__init__.py b/wscacicneo/__init__.py
index caeee6a..b6230f1 100644
--- a/wscacicneo/__init__.py
+++ b/wscacicneo/__init__.py
@@ -50,6 +50,7 @@ def main(global_config, **settings):
     #Usuários
     config.add_route('user', 'user/cadastro')
     config.add_route('post_user', 'post_user')
+    config.add_route('put_user', 'put_user')
     config.add_route('edituser', 'editar/user/{matricula}')
     #
     
diff --git a/wscacicneo/model/user.py b/wscacicneo/model/user.py
index fb08aff..a0386f4 100644
--- a/wscacicneo/model/user.py
+++ b/wscacicneo/model/user.py
@@ -114,6 +114,25 @@ class UserBase(WSCacicNeo):
             multivalued=False,
             required=True
         ))
+        
+        senha = Field(**dict(
+                    name='senha',
+                    alias='senha',
+                    description='Senha do Usuário',
+                    datatype='Text',
+                    indices=['Textual'],
+                    multivalued=False,
+                    required=True
+        ))
+        favoritos = Field(**dict(
+                    name='favoritos',
+                    alias='favoritos',
+                    description='Favoritos do Usuário',
+                    datatype='Text',
+                    indices=['Textual'],
+                    multivalued=True,
+                    required=False
+        ))
 
         base_metadata = BaseMetadata(
             name='users',
@@ -128,6 +147,8 @@ class UserBase(WSCacicNeo):
         content_list.append(cargo)
         content_list.append(setor)
         content_list.append(permissao)
+        content_list.append(senha)
+        content_list.append(favoritos)
 
         lbbase = Base(
             metadata=base_metadata,
diff --git a/wscacicneo/templates/editaruser.pt b/wscacicneo/templates/editaruser.pt
index 837906a..1d88ded 100644
--- a/wscacicneo/templates/editaruser.pt
+++ b/wscacicneo/templates/editaruser.pt
@@ -57,6 +57,12 @@
                   </div>
                 </div>
                 <div class="form-group">
+                    <label class="col-lg-2 control-label">Senha</label>
+                        <div class="col-lg-5">
+                        <input type="password" id="senha" class="form-control" placeholder="Informe novamente sua senha">
+                    </div>
+                </div>
+                <div class="form-group">
                   <div class="col-lg-offset-2 col-lg-6">
                     <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
                     <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
@@ -93,7 +99,7 @@
                 }else{
                 $.ajax({
                     type: "PUT",
-                    url: "${request.route_url('root')}post_user",
+                    url: "${request.route_url('root')}put_user",
                     data: data, 
                     success: function(){ alert('sucesso') },
                     error: function(){ alert('erro') },
diff --git a/wscacicneo/templates/user.pt b/wscacicneo/templates/user.pt
index 4dd87cc..cafe92f 100644
--- a/wscacicneo/templates/user.pt
+++ b/wscacicneo/templates/user.pt
@@ -57,6 +57,12 @@
                   </div>
                 </div>
                 <div class="form-group">
+                    <label class="col-lg-2 control-label">Senha</label>
+                        <div class="col-lg-5">
+                        <input type="password" id="senha" class="form-control" placeholder="Senha">
+                    </div>
+                </div>
+                <div class="form-group">
                   <div class="col-lg-offset-2 col-lg-6">
                     <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
                     <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
@@ -87,6 +93,7 @@
                     'cargo' : $('#cargo').val(),
                     'setor' : $('#setor').val(),
                     'permissao' : $('#permissao').val(),
+                    'senha' : $('#senha').val(),
                 }
                 if (data.email.indexOf("gov.br") > -1 == false){
                    alert('Somente é permitido cadastro de e-mails institucionais');
diff --git a/wscacicneo/views.py b/wscacicneo/views.py
index 15a5d04..c643e72 100644
--- a/wscacicneo/views.py
+++ b/wscacicneo/views.py
@@ -305,7 +305,8 @@ def post_user(request):
         telefone = doc['telefone'],
         cargo = doc['cargo'],
         setor = doc['setor'],
-        permissao = doc['permissao']
+        permissao = doc['permissao'],
+        senha = doc['senha']
     )
 
     id_doc = user_obj.create_user()
@@ -324,7 +325,8 @@ def edituser(request):
         telefone = 'telefone',
         cargo = 'cargo',
         setor = 'setor',
-        permissao = 'Gestor'
+        permissao = 'Gestor',
+        senha = 'senha'
     )
     search = user_obj.search_user(matricula)
     return {
@@ -335,5 +337,43 @@ def edituser(request):
         'telefone' : search.results[0].telefone,
         'cargo' : search.results[0].cargo,
         'setor' : search.results[0].setor,
-        'permissao' : search.results[0].permissao
+        'permissao' : search.results[0].permissao,
+        'senha' : search.results[0].permissao
     }
+
+@view_config(route_name='put_user')
+def put_user(request):
+    """
+    Edita um doc de user apartir do id
+    """
+    params = request.params
+    matricula = params['url']
+    user_obj = User(
+        nome = params['nome'],
+        matricula = params['matricula'],
+        email = params['email'],
+        orgao = params['orgao'],
+        telefone = params['telefone'],
+        cargo = params['cargo'],
+        setor = params['setor'],
+        permissao = params['permissao'],
+        senha = params['senha']
+    )
+    user = {
+        'nome' : params['nome'],
+        'matricula' : params['matricula'],
+        'email' : params['meila'],
+        'orgao' : params['orgao'],
+        'telefone' : params['telefone'],
+        'cargo' : params['cargo'],
+        'setor' : params['setor'],
+        'permissao' : params['permissao'],
+        'senha' : params['senha']
+    }
+    search = user_obj.search_orgao(matricula)
+    id = search.results[0]._metadata.id_doc
+    doc = json.dumps(user)
+    edit = user_obj.edit_user(id, doc)
+
+    return Response(edit)
+
--
libgit2 0.21.2