Follow up for for #158
Merge pull request #235 from Rise-Vision/issues/issue-158-user-settings-not-populated-for-inactive-user

Follow up for for #158