Patch to fix adding new admin or student

and other small issues.
Line is too long. [113/80]