#2: fixed bug with user's company