KAZOOUI-303: Another fix for missing top-right account