diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
index 80d3db2d1..1899b4419 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
@@ -1,19 +1,22 @@
 import argparse
 import logging
-import tempfile
+import subprocess
 import os
 import shutil
+import webbrowser
+import sys
 
 from StringIO import StringIO
 from zipfile import ZipFile
 from urllib import urlopen
-
+from datetime import datetime
+from appdirs import user_data_dir
 from twisted.web import server, static
 from twisted.internet import reactor, defer
 from jsonrpc.proxy import JSONRPCProxy
 
 from lbrynet.lbrynet_daemon.LBRYDaemon import LBRYDaemon, LBRYindex, LBRYFileRender
-from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_ADDRESS, API_PORT, DEFAULT_WALLET
+from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_ADDRESS, API_PORT, DEFAULT_WALLET, UI_ADDRESS
 
 log = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
@@ -43,8 +46,8 @@ def start():
                         type=str,
                         default="True")
     parser.add_argument("--ui",
-                        help="temp or path, default temp, path is the path of the dist folder",
-                        default="temp")
+                        help="path to custom UI folder",
+                        default="")
 
     try:
         JSONRPCProxy.from_url(API_CONNECTION_STRING).is_running()
@@ -56,33 +59,73 @@ def start():
     log.info("Starting lbrynet-daemon from command line")
 
     args = parser.parse_args()
-    download_ui = True
 
-    if args.ui != "temp" and os.path.isdir(args.ui):
-        download_ui = False
-        ui_dir = args.ui
-        log.info("Using user specified UI directory: " + str(ui_dir))
+    def getui(ui_dir=None):
+        if ui_dir:
+            if os.path.isdir(ui_dir):
+                log.info("Using user specified UI directory: " + str(ui_dir))
+                return defer.succeed(ui_dir)
+            else:
+                log.info("User specified UI directory doesn't exist: " + str(ui_dir))
 
-    if args.ui == "temp" or download_ui:
-        log.info("Downloading current web ui to temp directory")
-        ui_dir = tempfile.mkdtemp()
-        url = urlopen("https://rawgit.com/lbryio/lbry-web-ui/master/dist.zip")
-        z = ZipFile(StringIO(url.read()))
-        z.extractall(ui_dir)
+        def download_ui(dest_dir):
+            url = urlopen("https://rawgit.com/lbryio/lbry-web-ui/master/dist.zip")
+            z = ZipFile(StringIO(url.read()))
+            z.extractall(dest_dir)
+            return defer.succeed(dest_dir)
 
-    daemon = LBRYDaemon()
-    daemon.setup(args.wallet, args.update)
+        data_dir = user_data_dir("LBRY")
+        version_dir = os.path.join(data_dir, "ui_version_history")
 
-    root = LBRYindex(ui_dir)
-    root.putChild("css", static.File(os.path.join(ui_dir, "css")))
-    root.putChild("font", static.File(os.path.join(ui_dir, "font")))
-    root.putChild("img", static.File(os.path.join(ui_dir, "img")))
-    root.putChild("js", static.File(os.path.join(ui_dir, "js")))
-    root.putChild(API_ADDRESS, daemon)
-    root.putChild("view", LBRYFileRender())
+        git_version = subprocess.check_output(
+            "git ls-remote https://github.com/lbryio/lbry-web-ui.git | grep HEAD | cut -f 1", shell=True)
 
-    reactor.listenTCP(API_PORT, server.Site(root), interface=API_INTERFACE)
-    reactor.run()
+        if not os.path.isdir(data_dir):
+            os.mkdir(data_dir)
 
-    if download_ui:
-        shutil.rmtree(ui_dir)
\ No newline at end of file
+        if not os.path.isdir(os.path.join(data_dir, "ui_version_history")):
+            os.mkdir(version_dir)
+
+        if not os.path.isfile(os.path.join(version_dir, git_version)):
+            try:
+                f = open(os.path.join(version_dir, git_version), "w")
+                version_message = "[" + str(datetime.now()) + "] Updating UI --> " + git_version
+                f.write(version_message)
+                f.close()
+                log.info(version_message)
+            except:
+                log.info("You should have been notified to install xcode command line tools, once it's installed you can start LBRY")
+                sys.exit(0)
+
+            if os.path.isdir(os.path.join(data_dir, "lbry-web-ui")):
+                shutil.rmtree(os.path.join(data_dir, "lbry-web-ui"))
+        else:
+            version_message = "[" + str(datetime.now()) + "] UI version " + git_version + " up to date"
+            log.info(version_message)
+
+        if os.path.isdir(os.path.join(data_dir, "lbry-web-ui")):
+            return defer.succeed(os.path.join(data_dir, "lbry-web-ui"))
+        else:
+            return download_ui((os.path.join(data_dir, "lbry-web-ui")))
+
+    def setupserver(ui_dir):
+        root = LBRYindex(ui_dir)
+        root.putChild("css", static.File(os.path.join(ui_dir, "css")))
+        root.putChild("font", static.File(os.path.join(ui_dir, "font")))
+        root.putChild("img", static.File(os.path.join(ui_dir, "img")))
+        root.putChild("js", static.File(os.path.join(ui_dir, "js")))
+        root.putChild("view", LBRYFileRender())
+        return defer.succeed(root)
+
+    def setupapi(root, wallet):
+        daemon = LBRYDaemon()
+        root.putChild(API_ADDRESS, daemon)
+        reactor.listenTCP(API_PORT, server.Site(root), interface=API_INTERFACE)
+        return daemon.setup(wallet, "False")
+
+    d = getui(args.ui)
+    d.addCallback(setupserver)
+    d.addCallback(lambda r: setupapi(r, args.wallet))
+    d.addCallback(lambda _: webbrowser.open(UI_ADDRESS))
+
+    reactor.run()
\ No newline at end of file