making same changes as other user log branch
Merge pull request #33 from JustDuckItAll/bugfix-userActivity2

making same changes as other user log branch