small optimization. user is now not being queries twice anymore