.

shop/src/components/users/profilePage.js

@@ -125,9 +125,10 @@ const YourProfile = ({state, orders, loginStatus = {}, updateStatus, updatedUser
                         }/>
                     <button disabled = {
                       (newPicture == "PENDING") ||
-                      ( !isAdmin && (!nowPassword)) || 
-                       ((isAdmin &&  isOwner.id && data._id && isOwner.id == data._id) && !nowPassword ) ||
-                       (Object.keys(loginStatus).length == 0) ||
+                      ( !isAdmin && (!nowPassword || (Object.keys(loginStatus).length == 0))) || 
+                       (((isAdmin &&  isOwner.id && data._id && isOwner.id == data._id) && (!nowPassword  || (Object.keys(loginStatus).length == 0)))
+                        &&
+                       (Object.keys(loginStatus).length == 0) ) ||
                        (loginStatus.status && loginStatus.status == "RESOLVED" && !loginStatus.payload.data.login) 
                       }  
                          onClick = {