diff --git a/src/freedombone-utils-i2p b/src/freedombone-utils-i2p
index d25d6a74..9ea7a453 100755
--- a/src/freedombone-utils-i2p
+++ b/src/freedombone-utils-i2p
@@ -86,13 +86,14 @@ function remove_i2p {
     if [ -d /var/log/i2p ]; then
         rm /var/log/i2p
     fi
+    rm -rf /tmp/i2p*
 }
 
 function i2p_enable_sam {
     if [ ! -f /var/lib/i2p/i2p-config/clients.config ]; then
         service i2p stop
 
-        apt-get -yq remove i2p --purge
+        apt-get -yq remove i2p i2p-keyring --purge
         apt-get -yq remove i2p-router --purge
         if [ -d /var/lib/i2p ]; then
             rm -rf /var/lib/i2p
@@ -106,8 +107,10 @@ function i2p_enable_sam {
         if [ -d /var/log/i2p ]; then
             rm /var/log/i2p
         fi
+        rm -rf /tmp/i2p*
         apt-get -yq install i2p i2p-keyring
-        apt-get -yq install i2p-router
+        apt-get -yq install i2p-router --reinstall
+        systemctl restart i2p
         sleep 10
     fi
     if [ ! -f /var/lib/i2p/i2p-config/clients.config ]; then