Fix users handler