admin user changed to settings
Merge origin/master