Fix #4157: Fix password update and user delete after user changes.

Hi,

Here is a fix for https://sourceforge.net/p/phpmyadmin/bugs/4157/
The user isn't delete any more.

There was another issue: password update didn't seem to work...
Now, I can update a password and use the new one.

(There are some "minor rewrites", just to remove nested levels.)