diff --git a/Agent.Installer.Win/MainWindow.xaml b/Agent.Installer.Win/MainWindow.xaml
index 4e8b359c..3bd62704 100644
--- a/Agent.Installer.Win/MainWindow.xaml
+++ b/Agent.Installer.Win/MainWindow.xaml
@@ -69,6 +69,7 @@
                     Command="{Binding OpenLogsCommand}">
                 Logs
             </Button>
+
             <Button DockPanel.Dock="Right" 
                     HorizontalAlignment="Right" 
                     Style="{StaticResource NormalButton}" 
@@ -76,15 +77,6 @@
                     Click="CloseButton_Click">
                 Close
             </Button>
-            <Button DockPanel.Dock="Right" 
-                    HorizontalAlignment="Right" 
-                    Style="{StaticResource NormalButton}" 
-                    Margin="5,0,0,0"
-                    IsEnabled="{Binding IsReadyState}"
-                    Visibility="{Binding IsServiceMissing, Converter={StaticResource BooleanToVisibilityConverter}}"
-                    Command="{Binding InstallCommand}">
-                Install
-            </Button>
             <Button DockPanel.Dock="Right" 
                     HorizontalAlignment="Right"
                     Style="{StaticResource NormalButton}" 
@@ -94,6 +86,14 @@
                     Command="{Binding UninstallCommand}">
                 Uninstall
             </Button>
+            <Button DockPanel.Dock="Right" 
+                    HorizontalAlignment="Right" 
+                    Style="{StaticResource NormalButton}" 
+                    Content="{Binding InstallButtonText}"
+                    Margin="5,0,0,0"
+                    IsEnabled="{Binding IsReadyState}"
+                    Command="{Binding InstallCommand}">
+            </Button>
         </DockPanel>
     </Grid>
 </Window>
diff --git a/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs b/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
index ed1f6ead..986673fc 100644
--- a/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
+++ b/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
@@ -49,6 +49,8 @@ namespace Remotely.Agent.Installer.Win.ViewModels
             }
         }
 
+        public string InstallButtonText => IsServiceMissing ? "Install" : "Reinstall";
+
         public ICommand InstallCommand => new Executor(async (param) => { await Install(param); });
 
         public bool IsProgressVisible => Progress > 0;
@@ -77,6 +79,7 @@ namespace Remotely.Agent.Installer.Win.ViewModels
                 isServiceInstalled = value;
                 FirePropertyChanged(nameof(IsServiceInstalled));
                 FirePropertyChanged(nameof(IsServiceMissing));
+                FirePropertyChanged(nameof(InstallButtonText));
             }
         }
 
@@ -180,8 +183,9 @@ namespace Remotely.Agent.Installer.Win.ViewModels
             }
             else
             {
-                HeaderMessage = "Uninstall the Remotely service.";
-                StatusMessage = "Uninstalling the Remotely service will remove all remote acess to this device.";
+                HeaderMessage = "Modify the Remotely installation.";
+                StatusMessage = "Uninstalling the Remotely service will remove all remote acess to this device.\r\n\r\n" +
+                    "Reinstalling will retain the current settings and install the service again.";
             }
 
             var installerSettings = ReadInstallerSettings();