diff --git a/src/de/deadlocker8/budgetmaster/ui/Controller.java b/src/de/deadlocker8/budgetmaster/ui/Controller.java
index 07109ba91f39bcb7e39e0de28d3c29f7d2d4b47b..4b8239dec076ebeef916d6eaa4e876b9a46b702e 100644
--- a/src/de/deadlocker8/budgetmaster/ui/Controller.java
+++ b/src/de/deadlocker8/budgetmaster/ui/Controller.java
@@ -229,7 +229,7 @@ public class Controller
 	}
 
 	public void showConnectionErrorAlert(String errorMessage)
-	{
+	{		
 		if(!alertIsShowing)
 		{
 			Platform.runLater(() -> {
@@ -250,10 +250,8 @@ public class Controller
 				Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
 				dialogStage.getIcons().add(icon);
 				dialogStage.initOwner(stage);
-				dialogStage.setOnCloseRequest((event) -> {
-					alertIsShowing = false;
-				});
 				alert.showAndWait();
+				alertIsShowing = false;
 			});
 		}
 	}
diff --git a/src/de/deadlocker8/budgetmaster/ui/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/SettingsController.java
index a90283827cf0fba0542b0c17e5f15011a6e9a018..c477c8574241863b1a7f5801b941efaa8736222d 100644
--- a/src/de/deadlocker8/budgetmaster/ui/SettingsController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/SettingsController.java
@@ -54,7 +54,7 @@ public class SettingsController
 		if(controller.getSettings() != null)
 		{
 			textFieldURL.setText(controller.getSettings().getUrl());
-			textFieldSecret.setText(controller.getSettings().getSecret());
+			textFieldSecret.setText("******");
 			textFieldCurrency.setText(controller.getSettings().getCurrency());
 			if(controller.getSettings().isRestActivated())
 			{
@@ -153,6 +153,9 @@ public class SettingsController
 						Logger.error(e);
 						AlertGenerator.showAlert(AlertType.ERROR, "Fehler", "", "Beim Speichern der Einstellungen ist ein Fehler aufgetreten", controller.getIcon(), controller.getStage(), null, false);
 					}
+					
+					textFieldSecret.setText("******");
+					
 					controller.refresh(controller.getFilterSettings());
 					controller.showNotification("Erfolgreich gespeichert");
 				}