diff --git a/doc/100-General/10-Changelog.md b/doc/100-General/10-Changelog.md
index 5f28e97..d9d051a 100644
--- a/doc/100-General/10-Changelog.md
+++ b/doc/100-General/10-Changelog.md
@@ -18,6 +18,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 * [#363](https://github.com/Icinga/icinga-powershell-framework/issues/363) Fixes unneeded continue for JEA process lookup, in case no JEA pid is present
 * [#365](https://github.com/Icinga/icinga-powershell-framework/issues/365) Fixes Icinga environment corruption on Icinga Agent installation failure
 * [#366](https://github.com/Icinga/icinga-powershell-framework/issues/366) Fixes error handling with Icinga Director over IMC, by printing more detailed and user-friendly error messages
+* [#367](https://github.com/Icinga/icinga-powershell-framework/issues/367) Fixes Icinga Director register state not being saved on overview after registration of Host inside Self-Service API
 
 ### Enhancements
 
diff --git a/lib/core/installer/menu/installation/director/DirectorTemplate.psm1 b/lib/core/installer/menu/installation/director/DirectorTemplate.psm1
index 68850e1..c9ab8a9 100644
--- a/lib/core/installer/menu/installation/director/DirectorTemplate.psm1
+++ b/lib/core/installer/menu/installation/director/DirectorTemplate.psm1
@@ -101,6 +101,11 @@ function Resolve-IcingaForWindowsManagementConsoleInstallationDirectorTemplate()
     $ParentZone               = '';
     $MasterAddress            = '';
     $Ticket                   = '';
+    $DirectorHostRegister     = (Get-IcingaForWindowsInstallerStepSelection -InstallerStep 'Show-IcingaForWindowsManagementConsoleInstallationDirectorRegisterHost');
+
+    if ($null -eq $DirectorHostRegister) {
+        $DirectorHostRegister = 0;
+    }
 
     if (Test-IcingaPowerShellConfigItem -ConfigObject $DirectorConfig -ConfigKey 'agent_version') {
         $AgentVersion = $DirectorConfig.agent_version;
@@ -227,8 +232,7 @@ function Resolve-IcingaForWindowsManagementConsoleInstallationDirectorTemplate()
 
     Show-IcingaForWindowsInstallerMenuSelectInstallIcingaAgent -Automated -DefaultInput $InstallIcingaAgent;
     Show-IcingaForWindowsInstallationMenuEnterIcingaAgentVersion -Automated -Value $AgentVersion;
-
-    Show-IcingaForWindowsManagementConsoleInstallationDirectorRegisterHost -Automated;
+    Show-IcingaForWindowsManagementConsoleInstallationDirectorRegisterHost -DefaultInput $DirectorHostRegister -Automated;
 
     Enable-IcingaFrameworkConsoleOutput;
     Reset-IcingaForWindowsManagementConsoleInstallationDirectorConfigModifyState;