improve user roles selectiuon behavior FMS-25