Minor improvements.

app/Http/Controllers/UserController.php

@@ -136,6 +136,10 @@ class UserController extends Controller {
         $valid = $this->objAuth->getPermissions($request->username, $request->password);
         $cols = $this->getGroupColours()->toArray();
 
+        if ($valid['usr_editother'] == 1) {
+            array_push($getting, 'users.password');
+        }
+
         if ($valid['usr_emailshow'] == 1) {
             array_push($getting, 'users.email');
         }
@@ -373,12 +377,21 @@ class UserController extends Controller {
             $valid = $this->objAuth->getPermissions($request->username, $request->password);
 
             if ($valid['usr_editprofile'] == 1) {
-                DB::table('users')
-                    ->where('id', $request->id)
-                    ->update([
-                        'email' => $request->email,
-                        'password' => $request->password
-                   ]);
+                if (isset($request->newPassword)) {
+                    DB::table('users')
+                        ->where('id', $request->id)
+                        ->update([
+                            'email' => $request->email,
+                            'password' => $request->newPassword
+                       ]);
+                }
+                else {
+                    DB::table('users')
+                        ->where('id', $request->id)
+                        ->update([
+                            'email' => $request->email
+                       ]);
+                }
 
                 DB::table('usr_contacts')
                     ->where('user_id', $request->id)