Merge pull request #643 from FHenry/3.2

Fix bug [ bug #709 ]
Revert "Fix: only once superadmin and an admin can not delete/modify a superadmin"

This reverts commit 0216bdd311e747aef4a4051836a2ecbfa94f6896.