diff --git a/Install-EmberkomCloudBackup.ps1 b/Install-EmberkomCloudBackup.ps1
index 9f4e184..bd54364 100644
--- a/Install-EmberkomCloudBackup.ps1
+++ b/Install-EmberkomCloudBackup.ps1
@@ -16,33 +16,34 @@ switch ( $Edition.ToLower() ) {
 Import-MSP360Module
 
 # Exit this script if the agent is already installed
-If ( $(Get-MBSAgent) ) {
+If ( $(Get-MBSAgent -ErrorAction SilentlyContinue) ) {
     Microsoft.Powershell.Utility\Write-Output "Backup agent is already installed. This script will now exit."
     Return
 }
 
 # Download the installer
 $Installer = Download-File -URL $URL
+
 # 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
-}
+Write-Output "Adding backup user account: ${MSP360Username}"
+Try { Add-MBSUserAccount -User $MSP360Username -Password $(ConvertTo-SecureString -string $MSP360Password -AsPlainText -Force) }
 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 {
     Switch ([string]::IsNullOrEmpty($MasterPassword)) {
         $true  { Set-MBSAgentSetting -Edition $AgentEdition -Verbose }
-        $false { Set-MBSAgentSetting -Edition $AgentEdition -MasterPassword (ConvertTo-SecureString -String $MasterPassword -AsPlainText -Force) -Verbose }
+        $false { Set-MBSAgentSetting -Edition $AgentEdition -MasterPassword $(ConvertTo-SecureString -String $MasterPassword -AsPlainText -Force) -Verbose }
     }
 }
 Catch { Write-Error $_.Exception.Message }