Fix for quick reply and not logged users.
Merge branch 'master' into MNF