diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index a734cb16..ef63b9e3 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -41,7 +41,7 @@ TAHOELAFS_PORT=50213
 TAHOELAFS_ONION_PORT=8096
 
 TAHOELAFS_SHARED_DIR='Shared'
-TAHOE_COMMAND="cd /var/lib/tahoelafs && venv/bin/tahoe"
+TAHOE_COMMAND="cd /home/tahoelafs/tahoelafs && venv/bin/tahoe"
 
 tahoelafs_variables=(ONION_ONLY
                      TAHOELAFS_REPO
@@ -201,7 +201,7 @@ function install_tahoelafs {
     fi
 
     apt-get -yq install build-essential python-pip python-dev libffi-dev libssl-dev
-    apt-get -yq install libcrypto++-dev python-virtualenv
+    apt-get -yq install libcrypto++-dev python-pycryptopp python-cffi python-virtualenv
 
     # create a user to run the introducer
     if [ ! -d /home/tahoelafs ]; then
@@ -222,7 +222,7 @@ function install_tahoelafs {
     git checkout $TAHOELAFS_COMMIT -b $TAHOELAFS_COMMIT
     git submodule update --init --recursive
     virtualenv venv
-    venv/bin/pip install six packaging appdirs pycrypto==2.1.0
+    venv/bin/pip install six packaging appdirs pycrypto==2.1.0 cryptography==1.3.4
     venv/bin/pip install --editable .
     configure_firewall_for_tahoelafs
 
@@ -247,7 +247,7 @@ function install_tahoelafs {
     echo 'Type=simple' >> $TAHOELAFS_DAEMON_FILE
     echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
     echo "Group=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
-    echo "WorkingDirectory=/home/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
+    echo "WorkingDirectory=/home/tahoelafs/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
     echo "ExecStart=venv/bin/tahoe start /home/tahoelafs/.tahoe-introducer" >> $TAHOELAFS_DAEMON_FILE
     echo "ExecStop=venv/bin/tahoe stop /home/tahoelafs/.tahoe-introducer" >> $TAHOELAFS_DAEMON_FILE
     echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE