diff --git a/BuildsAppReborn.Client/UpdateChecker.cs b/BuildsAppReborn.Client/UpdateChecker.cs
index 8c1a16d..56ab837 100644
--- a/BuildsAppReborn.Client/UpdateChecker.cs
+++ b/BuildsAppReborn.Client/UpdateChecker.cs
@@ -9,6 +9,7 @@
 using BuildsAppReborn.Client.Properties;
 using BuildsAppReborn.Contracts.Models;
 using BuildsAppReborn.Contracts.UI.Notifications;
+using log4net;
 using Squirrel;
 
 namespace BuildsAppReborn.Client
@@ -72,7 +73,8 @@ private async void TimerOnElapsed(Object sender, ElapsedEventArgs elapsedEventAr
         private async Task UpdateCheckInternal()
         {
             if (!GeneralSettings.CheckForUpdates) return;
-            if (GeneralSettings.NotifyOnNewUpdate) this.notificationProvider.ShowMessage($"{this.version.ProductName} Update Check started", "Checking for new updates...");
+
+            this.logger.Info("Checking for update...");
             try
             {
                 var repo = Settings.Default.UpdateCheckUrl;
@@ -92,10 +94,17 @@ private async Task UpdateCheckInternal()
                         else
                         {
                             var result = await updateManager.UpdateApp();
-                            if (GeneralSettings.NotifyOnNewUpdate)
+                            if (result != null)
+                            {
+                                this.logger.Info("New Update found!");
+                                if (GeneralSettings.NotifyOnNewUpdate)
+                                {
+                                    this.notificationProvider.ShowMessage($"{this.version.ProductName} New update found!", "Update will be installed automatically on next start.");
+                                }
+                            }
+                            else
                             {
-                                if (result == null) this.notificationProvider.ShowMessage($"{this.version.ProductName} Update Check finished", "Currently no new updates");
-                                else this.notificationProvider.ShowMessage($"{this.version.ProductName} New update found!", "Update will be installed automatically on next start.");
+                                this.logger.Info("No Update found!");
                             }
                         }
                     }
@@ -103,8 +112,11 @@ private async Task UpdateCheckInternal()
             }
             catch (Exception exception)
             {
-                // ToDo: add proper logging and change message text
-                if (GeneralSettings.NotifyOnNewUpdate) this.notificationProvider.ShowMessage($"{this.version.ProductName} Update Check failed!", "See (currently not existing) log file.");
+                this.logger.Error("Error while checking for update", exception);
+                if (GeneralSettings.NotifyOnNewUpdate)
+                {
+                    this.notificationProvider.ShowMessage($"{this.version.ProductName} Update Check failed!", "See log file for more information.");
+                }
             }
         }
 
@@ -113,6 +125,7 @@ private async Task UpdateCheckInternal()
         #region Private Fields
 
         private readonly GlobalSettingsContainer globalSettingsContainer;
+        private ILog logger = LogManager.GetLogger(typeof(UpdateChecker));
         private INotificationProvider notificationProvider;
         private Timer timer = new Timer();
         private FileVersionInfo version = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
diff --git a/BuildsAppReborn.Client/Views/GeneralSettingsControl.xaml b/BuildsAppReborn.Client/Views/GeneralSettingsControl.xaml
index f8febad..305d22f 100644
--- a/BuildsAppReborn.Client/Views/GeneralSettingsControl.xaml
+++ b/BuildsAppReborn.Client/Views/GeneralSettingsControl.xaml
@@ -47,7 +47,7 @@
                                 Converter={StaticResource MinutesToTimeSpanConverter}}" />
         <TextBlock Grid.Row="3"
                    Grid.Column="0"
-                   Text="Notify when updating or checking" />
+                   Text="Notify when update available" />
         <CheckBox Grid.Row="3"
                   Grid.Column="1"
                   IsChecked="{Binding GeneralSettings.NotifyOnNewUpdate}"