SWC-1184: only if logged in
Merge pull request #828 from jay-hodgson/SWC-1184

SWC-1184: only if logged in