Fix: Available Users problem