BP-833, add correct order of users even after a phase has ended
3 files changed