diff --git a/profiles/DerGeret/Windows/Restore.ps1 b/profiles/DerGeret/Windows/Restore.ps1
index 6ed4c48d..e47e420a 100644
--- a/profiles/DerGeret/Windows/Restore.ps1
+++ b/profiles/DerGeret/Windows/Restore.ps1
@@ -15,6 +15,5 @@ function Restore-Apps {
 
 Write-Host "Starting Restoration of Windows";
 [Context]$context = [Context]::new();
-$context.UserName = "Manuel";
 Invoke-WindowsInstallation $context;
 Restart-Computer -Force;
diff --git a/profiles/Generic/Windows/Install.ps1 b/profiles/Generic/Windows/Install.ps1
index 68483ed6..f3fc26ad 100644
--- a/profiles/Generic/Windows/Install.ps1
+++ b/profiles/Generic/Windows/Install.ps1
@@ -9,6 +9,5 @@ function Restore-Apps {
 }
 
 [Context]$context = [Context]::new();
-$context.UserName = "Manuel";
 Invoke-WindowsInstallation $context;
 Restart-Computer -Force;
diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 47a64101..dd3fd0e5 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -9,6 +9,7 @@ function Invoke-WindowsInstallation([Context] $context)
 {
     $ErrorActionPreference = "Inquire";
     . "$PSScriptRoot/../Scripts/Prerequisites.ps1";
+    $context.UserName ??= "Manuel";
     Start-WindowsInstallation $context;
 }