Fix users
Merge branch 'master' of https://github.com/GeekStudentInside/NuitEMN into hao
merge from master