diff --git a/install.sh b/install.sh
index c3fce7b..a8ddfc0 100755
--- a/install.sh
+++ b/install.sh
@@ -25,22 +25,23 @@

 DIR=`dirname $0`

+
 if [ -n "$ONE_LOCATION" ]; then
     BIN_LOCATION="$ONE_LOCATION/bin"
     LIB_LOCATION="$ONE_LOCATION/lib"
+    ADDON_DIR=$HOME
 else
     BIN_LOCATION="/usr/bin"
     LIB_LOCATION="/usr/lib/one"
+    ADDON_DIR=$(getent passwd|grep ^${ONE_USER:=oneadmin}:|cut -d: -f6)
 fi

 cp $DIR/oneacct.rb $DESTDIR$LIB_LOCATION/ruby/oneacct.rb || error=true
 cp $DIR/oneacct $DESTDIR$BIN_LOCATION/oneacct || error=true

-if [ ! -e $HOME/.one/addons ]; then
-    mkdir $HOME/.one/addons || error
-fi
+mkdir -p $ADDON_DIR/.one/addons/accounting || error

-echo "2.2.0" > $HOME/.one/addons/accounting || error
+echo "2.2.0" > $ADDON_DIR/.one/addons/accounting/version || error

 if [ -n "$error" ]; then
     echo "There was a problem with the installation"