Privilege override added
Merge origin/master
Changing user details works