Pass user around correctly