Fix bug

Author: AndreiCristiDecuseara

src/now-ui-stubs/app/Http/Controllers/UserController.php

@@ -63,10 +63,12 @@ public function edit(User $user)
      */
     public function update(UserRequest $request, User  $user)
     {
+        $hasPassword = $request->get('password');
         $user->update(
-            $request->merge(['password' => Hash::make($request->get('password'))])
-                ->except([$request->get('password') ? '' : 'password']
-        ));
+            $request->merge([
+                'password' => Hash::make($request->get('password'))
+                ])->except([$hasPassword ? '' : 'password'])
+            );
 
         return redirect()->route('user.index')->withStatus(__('User successfully updated.'));
     }