edit user settings improvements [#48186885]