Dashboard current_organization fix

cc: @aaw, thanks for catching this. Will document repro steps on Dashboard PR.