diff --git a/onyx/include/admin/import_users.php b/onyx/include/admin/import_users.php
index 971a836f..b75c5f8c 100644
--- a/onyx/include/admin/import_users.php
+++ b/onyx/include/admin/import_users.php
@@ -87,10 +87,10 @@ if (!empty($_FILES["inputFile"]['tmp_name']))
           $output .= new_client($team->team_name, $misc_dir);
       }
     }
-    if (file_exists("$misc_dir/teams.pass"))
+    if (file_exists("$misc_dir/PKI/teams.pass"))
     {
-      $output .= file_get_contents("$misc_dir/teams.pass");
-      unlink("$misc_dir/teams.pass");
+      $output .= file_get_contents("$misc_dir/PKI/teams.pass");
+      unlink("$misc_dir/PKI/teams.pass");
     }
     $template->assign("output", $output);
   }
diff --git a/pki/CA.sh b/pki/CA.sh
index 53fef8f1..0ac76ffc 100644
--- a/pki/CA.sh
+++ b/pki/CA.sh
@@ -228,7 +228,7 @@ case $1 in
         else
             echo $ECHO_OPTS "Exported pkcs12 file is ${CLTP12}"
         fi
-        echo "$CLTNAM:$pass" >> ${PKI_DIR}/../teams.pass
+        echo "$CLTNAM:$pass" >> ${PKI_DIR}/teams.pass
 	echo "$CLTNAM:$pass"
         clean "client" ${CLTNAM}
         ;;