Organization dashboard fix

@fiallega Can you review this, please