diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 524244bf3d413fb29e42f2031db3cf26cdaee4e9..3102fe055ea00b489d9f1141f29b5b86bd18562e 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -144,8 +144,8 @@ Debian wrapper.config to try to prevent confusion.
  }
  
  showsetusermesg()  {
--    echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
-+    echo "`gettext "Please edit /etc/default/i2p and set the variable RUN_AS_USER"`."
+-    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
++    echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`."
  }
  
  checkifstartingasroot() {
@@ -153,12 +153,12 @@ Debian wrapper.config to try to prevent confusion.
          echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
          showsetusermesg
          echo
--        echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
-+        echo "`gettext \"To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.\"`"
+-        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
++        echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`"
          exit 1
      fi
  }
-@@ -1866,23 +1809,9 @@
+@@ -1858,24 +1806,9 @@
              status
              ;;
  
@@ -179,12 +179,13 @@ Debian wrapper.config to try to prevent confusion.
 -
 -        'remove' | 'uninstall')
 -            removedaemon
+-            ;;
 +        'install' | 'remove' | 'uninstall')
 +            echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
 +            exit 1
-             ;;
  
          'dump')
+             checkUser "" "$COMMAND"
 --- a/installer/resources/runplain.sh
 +++ b/installer/resources/runplain.sh
 @@ -11,8 +11,8 @@
@@ -329,8 +330,8 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "Falls gestartet, fordere einen Java Thread dump an"
  
  #: ../i2prouter:1788
--msgid "Please edit $0 and set the variable RUN_AS_USER"
--msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+-msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
 +msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
  
@@ -339,10 +340,10 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
  
  #: ../i2prouter:1796
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
--"Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
+-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
 +"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
 --- a/installer/resources/locale/po/messages_en.po
 +++ b/installer/resources/locale/po/messages_en.po
@@ -350,7 +351,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1788
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
@@ -359,7 +360,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1796
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
 --- a/installer/resources/locale/po/messages_fr.po
@@ -368,7 +369,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "Request a Java thread dump if running."
  
  #: ../i2prouter:1788
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 -msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
 +msgstr "Veuillez éditer /etc/default/i2p et paramétrer la variable RUN_AS_USER"
@@ -378,7 +379,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
  
  #: ../i2prouter:1796
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 -msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
 +msgstr "Pour exécuter en tant que root de toute façon, éditer /etc/default/i2p et mettre ALLOW_ROOT=true."
@@ -388,7 +389,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1780
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
@@ -397,7 +398,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1788
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
 --- a/installer/resources/locale/po/messages_ru.po
@@ -406,7 +407,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1780
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
@@ -415,6 +416,26 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1788
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
+--- a/installer/resources/locale/po/messages_sv.po
++++ b/installer/resources/locale/po/messages_sv.po
+@@ -187,13 +187,13 @@
+ msgstr "Fråga efter en Java thread dump vid drift."
+ 
+ #: ../i2prouter:1780
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+-msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
++msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER"
+ 
+ #: ../i2prouter:1785
+ msgid "Running I2P as the root user is *not* recommended."
+ msgstr "Att köra I2P som användare root är *inte* rekommenderat."
+ 
+ #: ../i2prouter:1788
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
++msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index d5b54506751f31d6112cdde06174fb722a2341e1..34ad1c0991dcb2190af945e645bf85cf3f905d7f 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -1793,7 +1793,7 @@ showUsage() {
 }
 
 showsetusermesg()  {
-    echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
+    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
 }
 
 checkifstartingasroot() {
@@ -1801,7 +1801,7 @@ checkifstartingasroot() {
         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
         showsetusermesg
         echo
-        echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
+        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
         exit 1
     fi
 }
diff --git a/installer/resources/locale/po/messages_de.po b/installer/resources/locale/po/messages_de.po
index dd78dfc5ebc620f26d006673adeb0f3685fbc8de..ea493e5406eb2e50da894613d77b54456bb5e3f3 100644
--- a/installer/resources/locale/po/messages_de.po
+++ b/installer/resources/locale/po/messages_de.po
@@ -192,14 +192,14 @@ msgid "Request a Java thread dump if running."
 msgstr "Falls gestartet, fordere einen Java Thread dump an"
 
 #: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
 
 #: ../i2prouter:1793
 msgid "Running I2P as the root user is *not* recommended."
 msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
 
 #: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
-"Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
+"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
diff --git a/installer/resources/locale/po/messages_en.po b/installer/resources/locale/po/messages_en.po
index 97b91236226ee9cc79101d64151fd163297fc52d..f5707d7ff8a73df08f34ea502227787d19270f89 100644
--- a/installer/resources/locale/po/messages_en.po
+++ b/installer/resources/locale/po/messages_en.po
@@ -185,7 +185,7 @@ msgid "Request a Java thread dump if running."
 msgstr ""
 
 #: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
 #: ../i2prouter:1793
@@ -193,5 +193,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
 #: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_fr.po b/installer/resources/locale/po/messages_fr.po
index 883b59c0fffc834940818786c5bd24a21605a717..4ff2af12ff2b2bc8bb750162e95a83f0bac29bf1 100644
--- a/installer/resources/locale/po/messages_fr.po
+++ b/installer/resources/locale/po/messages_fr.po
@@ -186,7 +186,7 @@ msgid "Request a Java thread dump if running."
 msgstr "Request a Java thread dump if running."
 
 #: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
 
 #: ../i2prouter:1793
@@ -194,5 +194,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
 
 #: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."
diff --git a/installer/resources/locale/po/messages_it.po b/installer/resources/locale/po/messages_it.po
index b3b1eea93630775003fdc857f8d8297729651050..e309b3dca34732ef5b2e907a04c75933c4ea49b8 100644
--- a/installer/resources/locale/po/messages_it.po
+++ b/installer/resources/locale/po/messages_it.po
@@ -187,7 +187,7 @@ msgid "Request a Java thread dump if running."
 msgstr ""
 
 #: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
 #: ../i2prouter:1785
@@ -195,5 +195,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
 #: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_ru.po b/installer/resources/locale/po/messages_ru.po
index 1fe035426b631cccfb31e8ca3877a0a9dd1c67fd..b0f43136f507c58b8935168749d439412bee7ffb 100644
--- a/installer/resources/locale/po/messages_ru.po
+++ b/installer/resources/locale/po/messages_ru.po
@@ -188,7 +188,7 @@ msgid "Request a Java thread dump if running."
 msgstr ""
 
 #: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
 #: ../i2prouter:1785
@@ -196,5 +196,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
 #: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_sv.po b/installer/resources/locale/po/messages_sv.po
index 8c89bb310f69ae59a6cef997984a641efe28da32..11d7a311f29f71b94e589a57df6d482896cb5069 100644
--- a/installer/resources/locale/po/messages_sv.po
+++ b/installer/resources/locale/po/messages_sv.po
@@ -187,13 +187,13 @@ msgid "Request a Java thread dump if running."
 msgstr "Fråga efter en Java thread dump vid drift."
 
 #: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgstr "Var god ändra $0 och sätt variabeln RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
 
 #: ../i2prouter:1785
 msgid "Running I2P as the root user is *not* recommended."
 msgstr "Att köra I2P som användare root är *inte* rekommenderat."
 
 #: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgstr "För att köra som root iallafall, ändra $0 och sätt ALLOW_ROOT=true"
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"