diff --git a/build_key-pass.sh b/build_key-pass.sh
index 6d5c8a6..0912705 100755
--- a/build_key-pass.sh
+++ b/build_key-pass.sh
@@ -468,7 +468,7 @@ cat << EOF >> "$_client_conf_file"  2> $log_file
 # This option has been deprecated since version 2.4 and 
 # will be removed from later distributions.
 #
-#ns-cert-type server
+;ns-cert-type server
 
 # If a tls-auth key is used on the server
 # then every client must also have the key.
@@ -501,6 +501,9 @@ cat << EOF >> "$_client_conf_file"  2> $log_file
 # Select a cryptographic cipher.
 # If the cipher option is used on the server
 # then you must also specify it here.
+;cipher BF-CBC        # Blowfish (default)
+;cipher AES-128-CBC   # AES
+;cipher DES-EDE3-CBC  # Triple-DES
 EOF
 
 if [[ -n "$SERVER_CIPHER" ]]; then
diff --git a/create_key_config.sh b/create_key_config.sh
index f0c4e5e..7253274 100755
--- a/create_key_config.sh
+++ b/create_key_config.sh
@@ -178,6 +178,9 @@ else
    fi
 fi
 
+
+[[ "${SERVER_CIPHER,,}" = "none" ]] && SERVER_CIPHER=""
+
 EASY_RSA_DIR="${OPENVPN_BASE_DIR}/easy-rsa"
 
 
@@ -515,8 +518,21 @@ else
    #error "$(cat $log_file)"
 fi
 
-_failed=false
 echo ""
+echononl "   Create directory '$target_dir'.."
+if [[ ! -d "$target_dir" ]] ; then
+   mkdir "$target_dir" > $log_file 2>&1
+   if [[ $? -eq 0 ]] ; then
+      echo_ok
+   else
+      echo_failed
+      fatal "$(cat $log_file)"
+   fi
+else
+   echo_skipped
+fi
+
+_failed=false
 echononl "   Copy key material into dir '${target_dir}/${KEY_CN}-${NEW_KEY_NAME}'.."
 if [[ -d "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}" ]]; then
 	mv "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}" "${target_dir}/${KEY_CN}-${NEW_KEY_NAME}.$_date" > $log_file 2>&1