diff --git a/lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1 b/lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1
index 9bb8200..7d7fe9e 100644
--- a/lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1
+++ b/lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1
@@ -280,7 +280,8 @@ function Get-IcingaAgentInstallerAnswerInput()
     param(
         $Prompt,
         [ValidateSet("y","n","v")]
-        $Default
+        $Default,
+        [switch]$Secure
     );
 
     $DefaultAnswer = '';
@@ -291,10 +292,15 @@ function Get-IcingaAgentInstallerAnswerInput()
         $DefaultAnswer = ' (y/N)';
     }
 
-    $answer = Read-Host -Prompt ([string]::Format('{0}{1}', $Prompt, $DefaultAnswer));
-    $answer = $answer.ToLower();
+    if (-Not $Secure) {
+        $answer = Read-Host -Prompt ([string]::Format('{0}{1}', $Prompt, $DefaultAnswer));
+    } else {
+        $answer = Read-Host -Prompt ([string]::Format('{0}{1}', $Prompt, $DefaultAnswer)) -AsSecureString;
+    }
 
     if ($Default -ne 'v') {
+        $answer = $answer.ToLower();
+
         $returnValue = 0;
         if ([string]::IsNullOrEmpty($answer) -Or $answer -eq $Default) {
             $returnValue = 1;