diff --git a/Fix-EmberkomCloudBackupProductEdition.ps1 b/Fix-EmberkomCloudBackupProductEdition.ps1
index 555cacb..6443a34 100644
--- a/Fix-EmberkomCloudBackupProductEdition.ps1
+++ b/Fix-EmberkomCloudBackupProductEdition.ps1
@@ -10,8 +10,7 @@ switch ( $Edition.ToLower() ) {
 }
 
 # Install and import additional Powershell module
-Install-MSP360Module
-Import-Module -Name MSP360
+Import-MSP360Module
 
 # Add backup user to installed product
 #Try {
diff --git a/Install-EmberkomCloudBackup.ps1 b/Install-EmberkomCloudBackup.ps1
index 479429d..88be709 100644
--- a/Install-EmberkomCloudBackup.ps1
+++ b/Install-EmberkomCloudBackup.ps1
@@ -1,7 +1,4 @@
-# This script requires the $Edition variable is set from the RMM script
-If (! $Edition ) { $Edition = 'desktop' }
-
-# Specify URL to "Backup for Windows" agent installer
+# Specify URL to "Backup for Windows" agent installer
 $ECB_WIN_URL = 'https://s3.amazonaws.com/cb_setups/MBS/53CFB286-7A97-4FDF-8CFA-475C0DB63A9A/Brands/FB8308E2-448A-4645-A5F6-A3632A7E57F4/EmberkomCloudBackup_v7.9.1.152_ALLEDITIONS_Setup.exe'
 
 # Specify URL to "Backup Virtual Machine Edition" agent installer
@@ -16,32 +13,37 @@ switch ( $Edition.ToLower() ) {
 }
 
 # Install and import additional Powershell module
-Install-MSP360Module
-Import-Module -Name MSP360
+Import-MSP360Module
 
-# Download the installer
-$Installer = Download-File -URL $URL
+# Install the agent if it's not currently installed
+If ( -not $(Get-MBSAgent) ) {
 
-# Install the agent
-Write-Output "Installing Emberkom Cloud Backup agent"
-Try { Start-Process "${Installer}" -ArgumentList "/S" -Wait }
-Catch { Write-Error $_.Exception.Message }
+    # Download the installer
+    $Installer = Download-File -URL $URL
 
-# Add backup user to installed product
-Try {
-    $MSP360Password = ConvertTo-SecureString -string $MSP360Password -AsPlainText -Force
-    Write-Output "Adding backup user account: ${MSP360Username}"
-    Add-MBSUserAccount -User $MSP360Username -Password $MSP360Password
+    # Install the agent
+    Write-Output "Installing Emberkom Cloud Backup agent"
+    Try { Start-Process "${Installer}" -ArgumentList "/S" -Wait }
+    Catch { Write-Error $_.Exception.Message }
+
+    # Add backup user to installed product
+    Try {
+        $MSP360Password = ConvertTo-SecureString -string $MSP360Password -AsPlainText -Force
+        Write-Output "Adding backup user account: ${MSP360Username}"
+        Add-MBSUserAccount -User $MSP360Username -Password $MSP360Password
+    }
+    Catch { Write-Error $_.Exception.Message }
+
+    # Wait a few seconds to let the agent check-in
+    Start-Sleep -Seconds 10
+
+    # Set the agent edition
+    # Note: the product edition must be set *after* the user is added
+    Write-Output "Setting Emberkom Cloud Backup agent edition to ""$AgentEdition"""
+    Try { Set-MBSAgentSetting -Edition $AgentEdition -Verbose }
+    Catch { Write-Error $_.Exception.Message }
 }
-Catch { Write-Error $_.Exception.Message }
-
-# Set the agent edition
-# Note: the product edition must be set *after* the user is added
-Write-Output "Setting Emberkom Cloud Backup agent edition to ""$AgentEdition"""
-Try { Set-MBSAgentSetting -Edition $AgentEdition -Verbose }
-Catch { Write-Error $_.Exception.Message }
 
 # Delete the desktop icon
-Write-Output "Removing desktop icon"
-Remove-Item -Path "${Env:PUBLIC}\Desktop\Emberkom Backup.LNK" -Force -ErrorAction SilentlyContinue
-Remove-Item -Path "${Env:PUBLIC}\Desktop\Emberkom Cloud Backup.LNK" -Force -ErrorAction SilentlyContinue
\ No newline at end of file
+If ( Test-Path "${Env:PUBLIC}\Desktop\Emberkom Backup.LNK" ) { Remove-Item -Path "${Env:PUBLIC}\Desktop\Emberkom Backup.LNK" -Force -ErrorAction SilentlyContinue }
+If ( Test-Path "${Env:PUBLIC}\Desktop\Emberkom Cloud Backup.LNK" ) { Remove-Item -Path "${Env:PUBLIC}\Desktop\Emberkom Cloud Backup.LNK" -Force -ErrorAction SilentlyContinue }
diff --git a/Uninstall-EmberkomCloudBackup.ps1 b/Uninstall-EmberkomCloudBackup.ps1
index cb752ce..2896110 100644
--- a/Uninstall-EmberkomCloudBackup.ps1
+++ b/Uninstall-EmberkomCloudBackup.ps1
@@ -1,8 +1,7 @@
-## Install and import additional Powershell modules
-Install-MSP360Module
-Import-Module -Name MSP360
+# Install and import additional Powershell modules
+Import-MSP360Module
 
-## Uninstall the agent
+# Uninstall the agent
 Write-Output "Uninstalling Emberkom Cloud Backup agent"
 Try { Remove-MBSAgent -RemoveSettings -Force }
 Catch { Write-Error $_.Exception.Message }