diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index eb89df5..6e6b40e 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -202,12 +202,11 @@ Section Install
     # default Firefox path.
     FileOpen $0 "$INSTDIR\i2pbrowser.bat" w
     FileWrite $0 "@echo off"
-# TODO: Test this thoroughly and enable.
-#     FileWriteByte $0 "13"
-#     FileWriteByte $0 "10"
-#     FileWrite $0 'start "" "$I2PINSTEXE\i2prouter" start'
-#     FileWriteByte $0 "13"
-#     FileWriteByte $0 "10"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p" -url %1'
@@ -220,12 +219,11 @@ Section Install
 
     FileOpen $0 "$INSTDIR\i2pbrowser-private.bat" w
     FileWrite $0 "@echo off"
-# TODO: Test this thoroughly and enable..
-#     FileWriteByte $0 "13"
-#     FileWriteByte $0 "10"
-#     FileWrite $0 'start "" "$I2PINSTEXE\i2prouter" start'
-#     FileWriteByte $0 "13"
-#     FileWriteByte $0 "10"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p" -private-window about:blank'
@@ -242,12 +240,11 @@ Section Install
     # default Firefox path.
     FileOpen $0 "$INSTDIR\i2pconfig.bat" w
     FileWrite $0 "@echo off"
-# TODO: Test this thoroughly and enable.
-#     FileWriteByte $0 "13"
-#     FileWriteByte $0 "10"
-#     FileWrite $0 'start "" "$I2PINSTEXE\i2prouter" start'
-#     FileWriteByte $0 "13"
-#     FileWriteByte $0 "10"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWrite $0 'start "" "$FFNONTORINSTEXE\firefox.exe" -no-remote -profile "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p" -url %1'