diff --git a/deploy/i2p b/deploy/i2p
index 4f9faf22..545ff312 100755
--- a/deploy/i2p
+++ b/deploy/i2p
@@ -45,7 +45,7 @@ fi
 clear
 echo 'Installing Epicyon on an i2p domain'
 
-username='epicyon'
+username='epicyon-i2p'
 NGINX_PORT=9554
 EPICYON_PORT=7158
 tunnels_dir=/var/lib/i2pd/tunnels.d
@@ -88,7 +88,7 @@ else
     adduser --system --home=${install_destination} --group $username
 fi
 
-chown -R epicyon:epicyon ${install_destination}
+chown -R ${username}:${username} ${install_destination}
 
 echo 'Creating a command script to obtain i2p domain names from dat files'
 { echo '#!/bin/bash';
diff --git a/deploy/onion b/deploy/onion
index 48022be1..51dd0dd0 100755
--- a/deploy/onion
+++ b/deploy/onion
@@ -27,7 +27,7 @@ fi
 clear
 echo 'Installing Epicyon on an onion domain'
 
-username='epicyon'
+username='epicyon-onion'
 NGINX_PORT=9553
 EPICYON_PORT=7157
 
@@ -69,7 +69,7 @@ else
     adduser --system --home=${install_destination} --group $username
 fi
 
-chown -R epicyon:epicyon ${install_destination}
+chown -R ${username}:${username} ${install_destination}
 
 echo 'Creating onion site configuration'
 if [ ! -d /etc/torrc.d ]; then