Add username for teachers and remove password.
Merge with origin/master.