diff --git a/src/java/net/i2p/i2pcontrol/I2PControlController.java b/src/java/net/i2p/i2pcontrol/I2PControlController.java
index c3f0039..383c952 100644
--- a/src/java/net/i2p/i2pcontrol/I2PControlController.java
+++ b/src/java/net/i2p/i2pcontrol/I2PControlController.java
@@ -25,6 +25,7 @@ import java.util.logging.LogManager;
 import net.i2p.I2PAppContext;
 import net.i2p.i2pcontrol.security.KeyStoreInitializer;
 import net.i2p.i2pcontrol.security.SecurityManager;
+import net.i2p.i2pcontrol.servlets.configuration.ConfigurationManager;
 import net.i2p.util.Log;
 
 import org.mortbay.http.SslListener;
@@ -47,8 +48,8 @@ import org.mortbay.util.InetAddrPort;
 public class I2PControlController{
     private static final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(I2PControlController.class);
     private static Object _lock = new Object();
+    private static ConfigurationManager _conf = ConfigurationManager.getInstance();
     private static Server _server;
-    private static Settings _settings;
     
     
     public static void main(String args[]) {
@@ -111,5 +112,6 @@ public class I2PControlController{
 		} catch (InterruptedException e) {
 			_log.error("Stopping server" + e);
 		}
+    	_conf.writeConfFile();
     }
 }
diff --git a/src/java/net/i2p/i2pcontrol/servlets/configuration/ConfigurationManager.java b/src/java/net/i2p/i2pcontrol/servlets/configuration/ConfigurationManager.java
index 0bc4f8f..efc5228 100644
--- a/src/java/net/i2p/i2pcontrol/servlets/configuration/ConfigurationManager.java
+++ b/src/java/net/i2p/i2pcontrol/servlets/configuration/ConfigurationManager.java
@@ -35,7 +35,9 @@ public class ConfigurationManager {
 	//Configurations with an Integer as value
 	private static Map<String, Integer> integerConfigurations = new HashMap<String, Integer>();
 
-	private ConfigurationManager() {}
+	private ConfigurationManager() {
+		readConfFile();
+	}
 	
 	public synchronized static ConfigurationManager getInstance() {
 		if(instance == null) {
@@ -70,7 +72,7 @@ public class ConfigurationManager {
 			}
 			br.close();
 		} catch (FileNotFoundException e) {
-			_log.error("Unable to find config file, " + DEFAULT_CONFIG_LOCATION);
+			_log.info("Unable to find config file, " + DEFAULT_CONFIG_LOCATION);
 		} catch (IOException e) {
 			_log.error("Unable to read from config file, " + DEFAULT_CONFIG_LOCATION);
 		}