Fixed regression in users contrioller.
Merge branch 'test' into dev