Fixes two user account issues: unset a user as admin or super-admin and making an assumption the system super-admin was user #1
Merge remote-tracking branch 'origin/develop' into develop