Fixed null user issue