diff --git a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
index 5b08fdbe..8ff79629 100644
--- a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
@@ -6,7 +6,7 @@
         </layout>
     </appender>
 
-    <logger name="com.lyndir" level="${log.level:-INFO}" />
+    <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/Config.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/Config.java
new file mode 100644
index 00000000..d50005fa
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/Config.java
@@ -0,0 +1,20 @@
+package com.lyndir.masterpassword;
+
+import com.lyndir.lhunath.opal.system.util.ConversionUtils;
+
+
+/**
+ * @author lhunath, 2014-08-31
+ */
+public class Config {
+
+    private static final Config instance = new Config();
+
+    public static Config get() {
+        return instance;
+    }
+
+    public boolean checkForUpdates() {
+        return ConversionUtils.toBoolean( System.getProperty( "mp.update.check" ) ).or( true );
+    }
+}
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
index 1612812b..856ddc99 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
@@ -48,6 +48,20 @@ public class GUI implements UnlockFrame.SignInCallback {
     public static void main(final String[] args)
             throws IOException {
 
+        if (Config.get().checkForUpdates())
+            checkUpdate();
+
+        GUI gui;
+        try {
+            gui = TypeUtils.newInstance( AppleGUI.class );
+        }
+        catch (NoClassDefFoundError e) {
+            gui = new GUI();
+        }
+        gui.open();
+    }
+
+    private static void checkUpdate() {
         try {
             Enumeration<URL> manifestURLs = Thread.currentThread().getContextClassLoader().getResources( JarFile.MANIFEST_NAME );
             while (manifestURLs.hasMoreElements()) {
@@ -74,15 +88,6 @@ public class GUI implements UnlockFrame.SignInCallback {
         catch (IOException e) {
             logger.wrn( e, "Couldn't check for version update." );
         }
-
-        GUI gui;
-        try {
-            gui = TypeUtils.newInstance( AppleGUI.class );
-        }
-        catch (NoClassDefFoundError e) {
-            gui = new GUI();
-        }
-        gui.open();
     }
 
     void open() {
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
index 5b08fdbe..8ff79629 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
@@ -6,7 +6,7 @@
         </layout>
     </appender>
 
-    <logger name="com.lyndir" level="${log.level:-INFO}" />
+    <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />