Merge "Revert^2 "[flexiglass] Fixes issue where user management settings didn't show"" into main