diff --git a/common/tools/cryptogen/main.go b/common/tools/cryptogen/main.go
index b8464e376d0..229202a8435 100644
--- a/common/tools/cryptogen/main.go
+++ b/common/tools/cryptogen/main.go
@@ -348,6 +348,17 @@ func generatePeerOrg(baseDir string, orgSpec OrgSpec) {
 			orgName, err)
 		os.Exit(1)
 	}
+
+	// copy the admin cert to each of the org's peer's MSP admincerts
+	for _, peerName := range peerNames {
+		err = copyAdminCert(usersDir, filepath.Join(peersDir, peerName,
+			"admincerts"), adminUserName)
+		if err != nil {
+			fmt.Printf("Error copying admin cert for org %s peer %s:\n%v\n",
+				orgName, peerName, err)
+			os.Exit(1)
+		}
+	}
 }
 
 func copyAdminCert(usersDir, adminCertsDir, adminUserName string) error {
@@ -431,6 +442,17 @@ func generateOrdererOrg(baseDir string, orgSpec OrgSpec) {
 		os.Exit(1)
 	}
 
+	// copy the admin cert to each of the org's orderers's MSP admincerts
+	for _, ordererName := range ordererNames {
+		err = copyAdminCert(usersDir, filepath.Join(orderersDir, ordererName,
+			"admincerts"), adminUserName)
+		if err != nil {
+			fmt.Printf("Error copying admin cert for org %s orderer %s:\n%v\n",
+				orgName, ordererName, err)
+			os.Exit(1)
+		}
+	}
+
 }
 
 func copyFile(src, dst string) error {