diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java
index bf70bfde8d3298020ee8d4940d1d4e87df09b5aa..1da9cedd55456ff0d8c5b5ba15ec10449f09ba1b 100644
--- a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java
+++ b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java
@@ -99,6 +99,7 @@ public class Strings
     public static final String NOTIFICATION_CHART_EXPORT = "notification.chart.export";
     public static final String NOTIFICATION_REPORT_SAVE = "notification.report.save";
     public static final String NOTIFICATION_SETTINGS_SAVE = "notification.settings.save";
+    public static final String NOTIFICATION_NO_UPDATE_AVAILABLE = "notification.no.update.available";
     
     //INFO
     public static final String INFO_TITLE_CATEGORY_DELETE = "info.title.category.delete";
diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties
index 9dc5a1fdac8f18eaaecf1ed781a77d7f8bb1c87e..562ebe1ed71f353b6c9cfe5b584392960d123fcb 100644
--- a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties
+++ b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties
@@ -95,7 +95,8 @@ month.december=Dezember
 # NOTIFICATION
 notification.chart.export=Diagramm erfolgreich exportiert.
 notification.report.save=Bericht erfolgreich gespeichert.
-notification.settings.save=Erfolgreich gespeichert
+notification.settings.save=Erfolgreich gespeichert.
+notification.no.update.available=Kein Update verf�gbar.
 
 # INFO
 info.title.category.delete=Kategorie l�schen
diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties
index 13aab3aba1bbcd7f5a96c406ab6ba2292276cf58..71b5e6e9f1667104774b1495733bed88912c97e0 100644
--- a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties
+++ b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties
@@ -96,6 +96,7 @@ month.december=December
 notification.chart.export=Chart successfully exported.
 notification.report.save=Report successfully saved.
 notification.settings.save=Successfully saved.
+notification.no.update.available=No update available.
 
 # INFO
 info.title.category.delete=Delete Category
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java
index ef7f808a8b42116582f815d867617cc789a46608..841b5c1bdff750cd2f9ff9cfcf6d0b1476470ca0 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java
@@ -355,7 +355,10 @@ public class Controller
 			String changes = updater.getChangelog(updater.getLatestVersion().getVersionCode());
 
 			if(!updateAvailable)
+			{
+				showNotification(Localization.getString(Strings.NOTIFICATION_NO_UPDATE_AVAILABLE));
 				return;
+			}
 			
 			Platform.runLater(()->{
 				Alert alert = new Alert(AlertType.INFORMATION);
@@ -488,6 +491,7 @@ public class Controller
 						toggleAllTabsExceptSettings(true);
 						tabPane.getSelectionModel().select(tabSettings);
 					});
+					return;
 				}
 				
 				
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java
index 30edabc73c34c988ed7c835dab01d2beb23a42ae..41bbcdca735c2f4e09bbb413ff3bed271280cf60 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java
@@ -90,6 +90,7 @@ public class SettingsController
 		comboBoxLanguage.setButtonCell(new LanguageCell(false));
 		comboBoxLanguage.setValue(LanguageType.ENGLISH);
 		previousLanguage = LanguageType.ENGLISH;
+		checkboxEnableAutoUpdate.setSelected(true);
 		
 		if(controller.getSettings().isComplete())
 		{