2 files changed, 15 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
index cce7d277b..6d99c1ff8 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -306,7 +306,14 @@ namespace Tango.PPC.UI.ViewModels
 
             if (connected)
             {
-                await NavigateTo(MachineSetupView.TimeZoneView);
+                if (BuildProvider.IsEureka)
+                {
+                    await NavigateTo(MachineSetupView.EnvironmentView);
+                }
+                else
+                {
+                    await NavigateTo(MachineSetupView.TimeZoneView);
+                }
             }
             else
             {
@@ -346,7 +353,12 @@ namespace Tango.PPC.UI.ViewModels
                 {
                     _ppcWebClient.Environment = DeploymentSlot;
                 }
-                await _operationSystemManager.ChangeTimeZone(SelectedTimeZone);
+
+                if (!BuildProvider.IsEureka)
+                {
+                    await _operationSystemManager.ChangeTimeZone(SelectedTimeZone);
+                }
+
                 _setup_result = await MachineSetupManager.Setup(SerialNumber);
                 State = MachineSetupStates.Completed;
                 LogManager.Log("Machine setup completed.");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index 50f4ed054..9b47cf390 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -328,7 +328,7 @@ namespace Tango.PPC.UI.ViewModels
         {
             _screenSaverTimer.Interval = TimeSpan.FromMinutes(Settings.ScreenSaverStartDuration).TotalMilliseconds;
 
-            if (Settings.EnableScreenSaver && !MachineProvider.IsConnected)
+            if (Settings.EnableScreenSaver && !MachineProvider.IsConnected && !BuildProvider.IsEureka)
             {
                 IsScreenSaverOn = true;
             }