MDL-45893 user_menu: more fred fixes