diff --git a/src/pki_bootstrap/res/libs/gen_client.sh b/src/pki_bootstrap/res/libs/gen_client.sh
index 9b03551..b093bbc 100755
--- a/src/pki_bootstrap/res/libs/gen_client.sh
+++ b/src/pki_bootstrap/res/libs/gen_client.sh
@@ -41,6 +41,12 @@ main() {
   fi
 
   if [[ -n $PARAM1 ]] && [[ -n $PARAM2 ]]; then
+    UNIQ_ID="${PARAM2}.${PARAM1}"
+    if [[ -f "distro/client_${UNIQ_ID}.p12" ]]; then
+      echo_block "ERROR: certifate  <<distro/client_${UNIQ_ID}.p12>>  already exists"
+      usage
+    fi
+
     gen_client $PARAM1 $PARAM2
   else
     usage
diff --git a/src/pki_bootstrap/res/libs/gen_server.sh b/src/pki_bootstrap/res/libs/gen_server.sh
index 156cb73..407dafe 100755
--- a/src/pki_bootstrap/res/libs/gen_server.sh
+++ b/src/pki_bootstrap/res/libs/gen_server.sh
@@ -39,12 +39,18 @@ main() {
     echo_block "ERROR: file cfg/SERIAL is missing"
     usage
   fi
-  if [[ ! -f "cfg/$PARAM1.cnf" ]]; then
-    echo_block "ERROR: file  cfg/$PARAM1.cnf  is missing"
-    usage
-  fi
 
   if [[ -n $PARAM1 ]] && [[ -n $PARAM2 ]]; then
+    UNIQ_ID="${PARAM2}.${PARAM1}"
+    if [[ -f "distro/server_${UNIQ_ID}.p12" ]]; then
+      echo_block "ERROR: certifate  <<distro/server_${UNIQ_ID}.p12>>  already exists"
+      usage
+    fi
+    if [[ ! -f "cfg/${PARAM1}.cnf" ]]; then
+      echo_block "ERROR: configuration file  <<cfg/${PARAM1}.cnf>>  is missing"
+      usage
+    fi
+
     gen_server $PARAM1 $PARAM2
   else
     usage