Fix error if user is not logged in
Merge branch 'hotfix/7.4.1' into production