diff --git a/fabric-ca/scripts/setup-fabric.sh b/fabric-ca/scripts/setup-fabric.sh
index 3983dbb1cf..5507e4ad3c 100755
--- a/fabric-ca/scripts/setup-fabric.sh
+++ b/fabric-ca/scripts/setup-fabric.sh
@@ -68,7 +68,7 @@ function registerPeerIdentities {
       done
       log "Registering admin identity with $CA_NAME"
       # The admin identity has the "hf.admin" attribute which is added to ECert by default
-      fabric-ca-client register -d --id.name $ADMIN_NAME --id.secret $ADMIN_PASS --id.attrs "hf.Revoker=true,hf.GenCRL=true,hf.admin=true:ecert,abac.init=true:ecert"
+      fabric-ca-client register -d --id.name $ADMIN_NAME --id.secret $ADMIN_PASS --id.attrs "hf.Registrar.Roles=client,hf.Registrar.Attributes=*,hf.Revoker=true,hf.GenCRL=true,hf.admin=true:ecert,abac.init=true:ecert"
       log "Registering user identity with $CA_NAME"
       fabric-ca-client register -d --id.name $USER_NAME --id.secret $USER_PASS
    done