diff --git a/juser/user_api.py b/juser/user_api.py
index b1320d32c..f90cbbaf9 100644
--- a/juser/user_api.py
+++ b/juser/user_api.py
@@ -84,10 +84,10 @@ def db_update_user(**kwargs):
     groups_post = kwargs.pop('groups')
     admin_groups_post = kwargs.pop('admin_groups')
     user_id = kwargs.pop('user_id')
-    user = User.objects.filter(id=user_id)
+    user = User.objects.get(id=user_id)
     if user:
         user.update(**kwargs)
-        user = user[0]
+        user.set_password(kwargs.pop('password'))
         user.save()
     else:
         return None
diff --git a/juser/views.py b/juser/views.py
index d8c81cc8f..b91f9de17 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -532,11 +532,11 @@ def user_edit(request):
         else:
             return HttpResponseRedirect('/juser/user_list/')
 
-        if password != user.password:
-            password_decode = password
-            password = CRYPTOR.md5_crypt(password)
-        else:
-            password_decode = None
+        # if password != user.password:
+        #     password_decode = password
+        #     password = CRYPTOR.md5_crypt(password)
+        # else:
+        #     password_decode = None
 
         db_update_user(user_id=user_id,
                        password=password,