Patch to fix adding new admin or student

and other small issues.