diff --git a/koji-setup/koji-add-user.sh b/koji-setup/koji-add-user.sh
index 9b3a096..5887945 100644
--- a/koji-setup/koji-add-user.sh
+++ b/koji-setup/koji-add-user.sh
@@ -75,16 +75,16 @@ trap cleanup EXIT
 
 pushd $WORK_DIR
 mkdir -p .koji
-cp $KOJI_PKI_DIR/$NEW_USER.pem  $WORK_DIR/.koji/client.crt
+cp $KOJI_PKI_DIR/$NEW_USER.pem  $WORK_DIR/.koji/koji_$NEW_USER.pem
 cp $KOJI_PKI_DIR/koji_ca_bundle.pem $WORK_DIR/.koji/koji_ca_bundle.pem
-cp $KOJI_PKI_DIR/certs/"$NEW_USER"_browser_cert.p12 $WORK_DIR/.koji/.
+cp $KOJI_PKI_DIR/certs/"$NEW_USER"_browser_cert.p12 $WORK_DIR/.koji/koji_"$NEW_USER"_browser_cert.p12
 cat > $WORK_DIR/.koji/config <<- EOT
 [koji]
 server = $KOJI_URL/kojihub
 weburl = $KOJI_URL/koji
 topurl = $KOJI_URL/kojifiles
 topdir = $KOJI_DIR
-cert = ~/.koji/client.crt
+cert = ~/.koji/koji_$NEW_USER.pem
 serverca = ~/.koji/koji_ca_bundle.pem
 anon_retry = true
 authtype = ssl