diff --git a/src/application/Main.java b/src/application/Main.java
index 69131b2..d2d84b0 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -84,6 +84,7 @@ public class Main extends Application
 			// config.xml NOT found, first start of app
 			System.out.println("keine XML gefunden!");
 			mwc.blockUI(true); // disable UI elements that need DB
+			mwc.blockUnlock();
 			File dir = new File(System.getProperty("user.home") + "/bin/jFxKasse");
 			dir.mkdir(); // Create new Subfolder
 		}
diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index d1edb11..dc5d211 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -24,6 +24,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
 
+import org.omg.CORBA.PUBLIC_MEMBER;
+
 import com.jfoenix.controls.JFXTextField;
 
 import javafx.beans.value.ChangeListener;
@@ -408,6 +410,8 @@ public class MainWindowController
 		initUI(); // Starting the UI elements
 		getSelectedCat();
 		createNewJob();
+		
+		btnLock.setDisable(false);
 
 	}
 
@@ -1252,6 +1256,12 @@ public class MainWindowController
 	public void updateTimeLabel()
 	{
 		labelTime.setText("Uhrzeit: " + getSystemTime());
+		
+		
+	}
+	
+	public void blockUnlock() {
+		btnLock.setDisable(true);
 	}
 
 }