Fixing the users task.
Merge pull request #2 from Enrise/bugfix/fixing-feedback-issue-1

Fixing the users task as per issue #1.