Fixes broken remembering of chosen reporting org