Enhancement of the user's admin page integration
Merge branch 'master' into dev