diff --git a/couchpotato/core/_base/_core/main.py b/couchpotato/core/_base/_core/main.py
index df4b0f56..4bfcf010 100644
--- a/couchpotato/core/_base/_core/main.py
+++ b/couchpotato/core/_base/_core/main.py
@@ -1,3 +1,4 @@
+from couchpotato import app
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.variable import cleanHost
@@ -5,6 +6,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from flask import request
+from flask.helpers import url_for
 import os
 import time
 import webbrowser
@@ -14,14 +16,24 @@ log = CPLog(__name__)
 
 class Core(Plugin):
 
+    ignore_restart = ['Core.crappyRestart']
+
     def __init__(self):
         addApiView('app.shutdown', self.shutdown)
         addApiView('app.restart', self.restart)
 
+        addEvent('app.crappy_restart', self.crappyRestart)
         addEvent('app.load', self.launchBrowser, priority = 100)
+        addEvent('app.base_url', self.createBaseUrl)
 
         self.removeRestartFile()
 
+    def crappyRestart(self):
+        ctx = app.test_request_context()
+        ctx.push()
+        self.urlopen('%s%sapp.restart' % (fireEvent('app.base_url', single = True), url_for('api.index')))
+        ctx.pop()
+
     def shutdown(self):
         self.initShutdown()
         return 'shutdown'
@@ -39,6 +51,7 @@ class Core(Plugin):
 
             brk = True
             for running in still_running:
+                running = list(set(running) - set(self.ignore_restart))
                 if len(running) > 0:
                     log.info('Waiting on plugins to finish: %s' % running)
                     brk = False
@@ -69,12 +82,7 @@ class Core(Plugin):
         if Env.setting('launch_browser'):
             log.info('Launching browser')
 
-            host = Env.setting('host')
-            if host == '0.0.0.0':
-                host = 'localhost'
-            port = Env.setting('port')
-
-            url = '%s:%d' % (cleanHost(host).rstrip('/'), int(port))
+            url = self.createBaseUrl()
             try:
                 webbrowser.open(url, 2, 1)
             except:
@@ -82,3 +90,11 @@ class Core(Plugin):
                     webbrowser.open(url, 1, 1)
                 except:
                     log.error('Could not launch a browser.')
+
+    def createBaseUrl(self):
+        host = Env.setting('host')
+        if host == '0.0.0.0':
+            host = 'localhost'
+        port = Env.setting('port')
+
+        return '%s:%d' % (cleanHost(host).rstrip('/'), int(port))
diff --git a/couchpotato/core/plugins/updater/main.py b/couchpotato/core/plugins/updater/main.py
index 420df12b..d18ffc86 100644
--- a/couchpotato/core/plugins/updater/main.py
+++ b/couchpotato/core/plugins/updater/main.py
@@ -79,7 +79,8 @@ class Updater(Plugin):
 
                 if local.getDate() < remote.getDate():
                     if self.conf('automatic') and not self.update_failed:
-                        self.doUpdate()
+                        if self.doUpdate():
+                            fireEvent('app.crappy_restart')
                     else:
                         self.update_version = {
                             'hash': remote.hash[:8],