diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index ad55013d223..a2570a39f13 100644
--- a/reactos/dll/win32/syssetup/wizard.c
+++ b/reactos/dll/win32/syssetup/wizard.c
@@ -521,7 +521,7 @@ ComputerPageDlgProc(HWND hwndDlg,
                              _T("Setup cannot continue until you enter the name of your computer."),
                              _T("ReactOS Setup"),
                              MB_ICONERROR | MB_OK);
-				  SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME));
+                  SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME));
                   SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
                   return TRUE;
                 }
@@ -534,6 +534,7 @@ ComputerPageDlgProc(HWND hwndDlg,
                              _T("Setup failed to set the computer name."),
                              _T("ReactOS Setup"),
                              MB_ICONERROR | MB_OK);
+                  SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME));
                   SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
                   return TRUE;
                 }