diff --git a/src/de/deadlocker8/budgetmaster/ui/Controller.java b/src/de/deadlocker8/budgetmaster/ui/Controller.java
index f18acda0b3ac9ab2331fd3f89c66a2db099b6855..72dd89028d9fb763269ae8ada420ba7ab6cbf6be 100644
--- a/src/de/deadlocker8/budgetmaster/ui/Controller.java
+++ b/src/de/deadlocker8/budgetmaster/ui/Controller.java
@@ -76,14 +76,6 @@ public class Controller implements Refreshable
 
 		settings = Utils.loadSettings();
 
-		if(settings == null)
-		{			
-			Platform.runLater(() -> {
-				AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Bitte gibt zuerst deine Serverdaten ein!", icon, stage, null, false);
-				tabPane.getSelectionModel().select(tabSettings);
-			});
-		}
-		
 		try
 		{
 			FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/de/deadlocker8/budgetmaster/ui/HomeTab.fxml"));
@@ -140,7 +132,17 @@ public class Controller implements Refreshable
 		buttonLeft.setStyle("-fx-background-color: transparent;");
 		buttonRight.setStyle("-fx-background-color: transparent;");
 		
-		refresh();
+		if(settings == null)
+		{			
+			Platform.runLater(() -> {
+				AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Bitte gibt zuerst deine Serverdaten ein!", icon, stage, null, false);
+				tabPane.getSelectionModel().select(tabSettings);
+			});
+		}
+		else
+		{
+			refresh();
+		}
 	}
 
 	public Stage getStage()
diff --git a/src/de/deadlocker8/budgetmaster/ui/HomeTab.fxml b/src/de/deadlocker8/budgetmaster/ui/HomeTab.fxml
index 2af758091a2ad4c11bec23977025936afbb84bcc..0144989045ba447bb06c251528de84497b54b7b2 100644
--- a/src/de/deadlocker8/budgetmaster/ui/HomeTab.fxml
+++ b/src/de/deadlocker8/budgetmaster/ui/HomeTab.fxml
@@ -12,12 +12,12 @@
    <children>
       <VBox alignment="TOP_CENTER" layoutY="24.0" prefHeight="562.0" prefWidth="772.0" spacing="15.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
          <children>
-            <Label fx:id="labelBudget" text="372,56 €">
+            <Label fx:id="labelBudget" text="0,00 €">
                <font>
                   <Font name="System Bold" size="55.0" />
                </font>
             </Label>
-            <Label fx:id="labelStartBudget" text="von 560,00 € verbleibend">
+            <Label fx:id="labelStartBudget" text="von 0,00 € verbleibend">
                <font>
                   <Font name="System Bold" size="18.0" />
                </font>
diff --git a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
index d9b8f3ef7461edd37451b81d334e837fc143c0b5..bb8e83b04bffff61ed232dd6dc0fb2b67a26d6c3 100644
--- a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
@@ -66,7 +66,7 @@ public class PaymentController implements Refreshable
 						if(event.getClickCount() == 2)
 						{
 							PaymentCell c = (PaymentCell)event.getSource();
-							//don't allow editing of payment "rest"
+							// don't allow editing of payment "rest"
 							if(c.getItem().getCategoryID() != 2)
 							{
 								payment(!c.getItem().isIncome(), true, c.getItem());
@@ -173,8 +173,13 @@ public class PaymentController implements Refreshable
 	private void refreshCounter()
 	{
 		Budget budget = new Budget(listView.getItems());
-		labelIncomes.setText(String.valueOf(Helpers.NUMBER_FORMAT.format(budget.getIncomeSum()).replace(".", ",")) + " " + controller.getSettings().getCurrency());
-		labelPayments.setText(String.valueOf(Helpers.NUMBER_FORMAT.format(budget.getPaymentSum()).replace(".", ",")) + " " + controller.getSettings().getCurrency());
+		String currency = "€";
+		if(controller.getSettings() != null)
+		{
+			currency = controller.getSettings().getCurrency();
+		}
+		labelIncomes.setText(String.valueOf(Helpers.NUMBER_FORMAT.format(budget.getIncomeSum()).replace(".", ",")) + " " + currency);
+		labelPayments.setText(String.valueOf(Helpers.NUMBER_FORMAT.format(budget.getPaymentSum()).replace(".", ",")) + " " + currency);
 	}
 
 	public void deleteNormalPayment(NormalPayment payment)
@@ -208,15 +213,15 @@ public class PaymentController implements Refreshable
 	}
 
 	public void deleteFuturePayments(RepeatingPaymentEntry payment)
-	{		
+	{
 		try
 		{
-			ServerConnection connection = new ServerConnection(controller.getSettings());	
-			RepeatingPayment oldRepeatingPayment = connection.getRepeatingPayment(payment.getRepeatingPaymentID());			
+			ServerConnection connection = new ServerConnection(controller.getSettings());
+			RepeatingPayment oldRepeatingPayment = connection.getRepeatingPayment(payment.getRepeatingPaymentID());
 			RepeatingPayment newRepeatingPayment = new RepeatingPayment(payment.getID(), payment.getAmount(), oldRepeatingPayment.getDate(), payment.getCategoryID(), payment.getName(), payment.getRepeatInterval(), payment.getDate(), payment.getRepeatMonthDay());
 			connection.deleteRepeatingPayment(payment);
 			connection.addRepeatingPayment(newRepeatingPayment);
-		
+
 			controller.refresh();
 		}
 		catch(Exception e)