diff --git a/src/acct/watch_helper.rb b/src/acct/watch_helper.rb
index 5873211787..ce610feee5 100644
--- a/src/acct/watch_helper.rb
+++ b/src/acct/watch_helper.rb
@@ -5,13 +5,16 @@ module WatchHelper
     ONE_LOCATION=ENV["ONE_LOCATION"]
 
     if !ONE_LOCATION
-        ACCTD_CONF="/etc/one/acctd.conf"
-        ACCT_DB="/var/one/oneacct.db"
+        VAR_LOCATION = "/var/lib/one"
+        ETC_LOCATION = "/etc/one"
     else
-        ACCTD_CONF=ONE_LOCATION+"/etc/acctd.conf"
-        ACCT_DB=ONE_LOCATION+"/var/oneacct.db"
+        VAR_LOCATION = ONE_LOCATION + "/var"
+        ETC_LOCATION = ONE_LOCATION + "/etc"
     end
 
+    ACCTD_CONF  = ETC_LOCATION + "/acctd.conf"
+    ACCT_DB     = VAR_LOCATION + "/oneacct.db"
+
     CONF = YAML.load_file(ACCTD_CONF)
 
     if CONF[:DB]