diff --git a/bin/create_user.sh b/bin/create_user.sh
index 184733a..58c4558 100755
--- a/bin/create_user.sh
+++ b/bin/create_user.sh
@@ -422,9 +422,13 @@ if [ ${INFO} -eq 1 ]; then
 	exit;
 fi;
 # check if there are any files in the SSH_KEYGEN_FOLDER, else skip zip file creation and file move
+has_pem_files=0;
 if (shopt -s nullglob dotglob; f=("${SSH_KEYGEN_FOLDER}"*".pem"*); ((${#f[@]}))); then
-	# zip everything and remove data in ssh key folder, delete output file with passwords
-	if [ ${TEST} -eq 0 ]; then
+	has_pem_files=1;
+fi;
+# zip everything and remove data in ssh key folder, delete output file with passwords
+if [ ${TEST} -eq 0 ]; then
+	if [ "${has_pem_files}" -eq 1 ]; then
 		zip -r \
 			"${ROOT_FOLDER}${output_zip_folder}${output_zip}" \
 			"${input_file}" \
@@ -432,26 +436,32 @@ if (shopt -s nullglob dotglob; f=("${SSH_KEYGEN_FOLDER}"*".pem"*); ((${#f[@]})))
 			"${SSH_KEYGEN_FOLDER}" \
 			-x\*.gitignore;
 	else
-		echo "zip -r \\"
-		echo "${ROOT_FOLDER}${output_zip_folder}${output_zip} \\"
-		echo "${input_file} \\"
-		echo "${output_file} \\"
-		echo "${SSH_KEYGEN_FOLDER} \\"
-		echo "-x\*.gitignore;"
+		echo "- Skip ZIP file creation, no pem files";
 	fi;
-	echo "Download: ${ROOT_FOLDER}${output_zip_folder}${output_zip}";
-	# cleam up user log file and ssh keys
-	if [ ${TEST} -eq 0 ]; then
+else
+	echo "zip -r \\"
+	echo "${ROOT_FOLDER}${output_zip_folder}${output_zip} \\"
+	echo "${input_file} \\"
+	echo "${output_file} \\"
+	echo "${SSH_KEYGEN_FOLDER} \\"
+	echo "-x\*.gitignore;"
+fi;
+echo "Download: ${ROOT_FOLDER}${output_zip_folder}${output_zip}";
+# cleam up user log file and ssh keys
+if [ ${TEST} -eq 0 ]; then
+	if [ "${has_pem_files}" -eq 1 ]; then
 		# move pub to created folders
 		mv "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*.pub "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB}";
 		# delete the rest
 		rm "${ROOT_FOLDER}${output_file}";
 		rm "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*;
 	else
-		echo "$> mv ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*.pub ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB};";
-		echo "$> rm ${ROOT_FOLDER}${output_file}";
-		echo "$> rm ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*";
+		echo "- Skip pub file move and cleanup, no pem files";
 	fi;
+else
+	echo "$> mv ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*.pub ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB};";
+	echo "$> rm ${ROOT_FOLDER}${output_file}";
+	echo "$> rm ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*";
 fi;
 
 # __END__