Fix users show code as per new logic