MDL-40200 Administration: do not add duplicate code