fixed bugs with geting corect user