Hot fixes

In this method originally we check only site roles such as Teacher or
Student, Admin regular role was missed