Fix user filtering on the user maintenance screen
Merge branch 'release/1.0.2'