Fixed user retrieval