Merge pull request #4067 from pief/updateprofile_modpass