diff --git a/cbpi/__init__.py b/cbpi/__init__.py
index 8b2bf2b..7aca342 100644
--- a/cbpi/__init__.py
+++ b/cbpi/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "4.2.0.a4"
+__version__ = "4.2.0.a5"
 __codename__ = "Indian Summer"
 
diff --git a/cbpi/cli.py b/cbpi/cli.py
index 64eca20..a885bf6 100644
--- a/cbpi/cli.py
+++ b/cbpi/cli.py
@@ -151,6 +151,9 @@ class CraftBeerPiCli():
                 print("CraftBeerPi Autostart is {}OFF{}".format(Fore.RED,Style.RESET_ALL))
         elif(name == "on"):
             user=os.getlogin()
+            path="/usr/local/bin/cbpi start"
+            if os.path.exists("/home/"+user+"/.local/bin/cbpi") is True:
+                    path="/home/"+user+"/.local/bin/cbpi start"
             print("Add craftbeerpi.service to systemd")
             try:
                 if os.path.exists(os.path.join("/etc/systemd/system","craftbeerpi.service")) is False:
@@ -166,7 +169,7 @@ class CraftBeerPiCli():
                         srcfile=str(srcfile).replace('\\','/')
 
                     template = templateEnv.get_template("craftbeerpi.service")
-                    outputText = template.render(user=user)
+                    outputText = template.render(user=user, path=path)
                     with open(srcfile, "w") as fh:
                         fh.write(outputText)
                     destfile = os.path.join("/etc/systemd/system")
diff --git a/cbpi/config/craftbeerpi.template b/cbpi/config/craftbeerpi.template
index 1fc26e3..eb8092c 100644
--- a/cbpi/config/craftbeerpi.template
+++ b/cbpi/config/craftbeerpi.template
@@ -3,7 +3,7 @@ Description=Craftbeer Pi
 
 [Service]
 WorkingDirectory=/home/{{ user }}
-ExecStart=/home/{{ user }}/.local/bin/cbpi start
+ExecStart={{ path }} start
 
 [Install]
 WantedBy=multi-user.target