fixed staff login hopefully
Merge branch 'yifan/staff-login'