diff --git a/windows_archive/archive-teslacam-clips b/windows_archive/archive-teslacam-clips
index 6383c94..a9c6b4d 100644
--- a/windows_archive/archive-teslacam-clips
+++ b/windows_archive/archive-teslacam-clips
@@ -96,7 +96,7 @@ function move_clips_to_archive () {
         /root/bin/send-pushover $move_count
     fi
   fi
-  
+
   log "Finished moving clips to archive."
 }
 
@@ -132,7 +132,10 @@ function unmount_cam_drive () {
 
 log "Starting..."
 
-ensure_archive_is_mounted
+if [ ! -r "/root/.teslaCamRsyncConfig" ]
+then
+    ensure_archive_is_mounted
+fi
 
 disconnect_usb_drives_from_host
 
diff --git a/windows_archive/setup-teslausb b/windows_archive/setup-teslausb
index 1410dca..428b3cf 100644
--- a/windows_archive/setup-teslausb
+++ b/windows_archive/setup-teslausb
@@ -212,7 +212,7 @@ if [ $RSYNC_ENABLE = true ]
 then
     check_variable "RSYNC_USER"
     check_variable "RSYNC_SERVER"
-    archiveserver = $RSYNC_SERVER
+    export archiveserver=$RSYNC_SERVER
     check_variable "RSYNC_PATH"
 else # Else for now, TODO allow both for more redundancy?
     check_variable "sharename"