diff --git a/build.xml b/build.xml
index 678abccf9..a947584ad 100644
--- a/build.xml
+++ b/build.xml
@@ -408,6 +408,7 @@
         <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
         <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
+        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy todir="pkg-temp/lib/wrapper/win32/">
             <fileset dir="installer/lib/wrapper/win32/" />
diff --git a/installer/install.xml b/installer/install.xml
index 4adcf1609..40a6e59c8 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -183,8 +183,8 @@
         <pack name="Windows Service" required="no">
             <description>Automatically start I2P in the background</description>
             <os family="windows" />
+            <executable targetfile="$INSTALL_PATH/set_config_dir_for_nt_service.bat" stage="postinstall" failure="warn" keep="false" />
 <!--
-            <executable targetfile="$INSTALL_PATH/install_i2p_service_winnt.bat" stage="postinstall" failure="warn" keep="true" />
 -->
             <executable targetfile="$INSTALL_PATH/install_i2p_service_winnt.bat" stage="postinstall" failure="warn" keep="true">
                 <args>
@@ -198,9 +198,6 @@
                     <arg value="$INSTALL_PATH\wrapper.config" />
                 </args>
             </executable>
-<!--
-            <executable targetfile="$INSTALL_PATH/uninstall_i2p_service_winnt.bat" stage="uninstall" failure="warn" keep="true" />
--->
             <executable targetfile="$INSTALL_PATH/uninstall_i2p_service_winnt.bat" stage="uninstall" failure="warn" keep="true">
                 <args>
                     <arg value="$INSTALL_PATH\wrapper.config" />
diff --git a/installer/resources/set_config_dir_for_nt_service.bat b/installer/resources/set_config_dir_for_nt_service.bat
new file mode 100644
index 000000000..adbabdad7
--- /dev/null
+++ b/installer/resources/set_config_dir_for_nt_service.bat
@@ -0,0 +1,4 @@
+@echo off
+cd /d %~dp0
+echo.
+echo wrapper.java.additional.5=-Di2p.dir.config="%APPDATA%\i2p">>wrapper.config
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index 1a8249798..a1f414ac2 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -164,14 +164,22 @@ public class WorkingDir {
         }
     }
 
-    /** Returns <code>false</code> if a directory is empty, or contains nothing besides a subdirectory named plugins */
+    /**
+     * Tests if <code>dir</code> has been set up as a I2P working directory.<br/>
+     * Returns <code>false</code> if a directory is empty, or contains nothing besides
+     * subdirectories named <code>plugins</code> and/or <code>logs</code>.<br/>
+     * Returns <code>true</code> if the directory contains something not named
+     * <code>plugins</code> or <code>logs</code>.</br>
+     * This allows to pre-install plugins before the first router start.
+     */
     private static boolean isSetup(File dir) {
         if (dir.isDirectory()) {
             String[] files = dir.list();
-            if (files.length == 0)
+            if (files == null)
                 return false;
-            if (files.length>1 || !"plugins".equals(files[0]))
-                return true;
+            for (String file: files)
+                if (!"plugins".equals(file) && !"logs".equals(file))
+                    return true;
         }
         return false;
     }