Reinstates the ability for admin to let users try to login with their NC...

Reinstates the ability for admin to let users try to login with their NC email/password (instead of username/password), and a few small fixes.