diff --git a/run/cifs_archive/verify-archive-configuration.sh b/run/cifs_archive/verify-archive-configuration.sh
index b7d47e1..684a42b 100644
--- a/run/cifs_archive/verify-archive-configuration.sh
+++ b/run/cifs_archive/verify-archive-configuration.sh
@@ -24,6 +24,8 @@ function check_archive_mountable () {
     mkdir "$test_mount_location"
   fi
   
+  local tmp_credentials_file_path="/root/.teslaCamArchiveCredentials"
+
   local mount_failed=false
   mount -t cifs "//$archive_server_ip_address/$sharename" "$test_mount_location" -o "vers=${cifs_version},credentials=${tmp_credentials_file_path},iocharset=utf8,file_mode=0777,dir_mode=0777" || mount_failed=true
 
diff --git a/setup/pi/setup-teslausb b/setup/pi/setup-teslausb
index b80034e..0b52fe1 100644
--- a/setup/pi/setup-teslausb
+++ b/setup/pi/setup-teslausb
@@ -320,10 +320,10 @@ then
   mkdir /root/bin
 fi
 
-install_archive_scripts
-
 get_script /root/bin get-archiveserver-ip-address.sh run
 
+install_archive_scripts
+/root/bin/configure-archive.sh
 /root/bin/verify-archive-configuration.sh
 
 check_available_space
@@ -332,7 +332,6 @@ get_ancillary_setup_scripts
 
 pushd ~
 
-
 configure_archive_scripts
 
 configure_pushover_scripts
@@ -346,8 +345,6 @@ headless_setup_progress_flash 3
 
 create_usb_drive_backing_files
 
-/root/bin/configure-archive.sh
-
 configure_rc_local
 
 configure_hostname