Next step in refactoring - getting logged in user