diff --git a/ENI2/EditControls/CompareExcelDialog.xaml.cs b/ENI2/EditControls/CompareExcelDialog.xaml.cs
index a9d4f9f1..3bdbe223 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml.cs
+++ b/ENI2/EditControls/CompareExcelDialog.xaml.cs
@@ -221,6 +221,7 @@ namespace ENI2.EditControls
             if (ofd.ShowDialog() ?? false)
             {
                 textBoxSource.Text = ofd.FileName;
+                _sourcePath = ofd.FileName;
             }
             EnableCompareButton();
         }
@@ -234,6 +235,7 @@ namespace ENI2.EditControls
             if (ofd.ShowDialog() ?? false)
             {
                 textBoxTarget.Text = ofd.FileName;
+                _targetPath = ofd.FileName;
             }
             EnableCompareButton();
         }
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index e0a654ab..79fd8411 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -333,8 +333,9 @@ namespace ENI2
             this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString);
             labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed";
             labelVersion.Text = "V. " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;            
+            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
             Microsoft.Win32.SystemEvents.SessionEnded += SystemEvents_SessionEnded;
+            this.textUsername.Focus();
         }
 
         private void SystemEvents_SessionEnded(object sender, Microsoft.Win32.SessionEndedEventArgs e)