diff --git a/servers/youtube.py b/servers/youtube.py
index 5c8c0d63..9218ee7f 100644
--- a/servers/youtube.py
+++ b/servers/youtube.py
@@ -19,45 +19,43 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     import xbmc
     from xbmcaddon import Addon
     logger.debug("(page_url='%s')" % page_url)
-    video_urls = [['Youtube', 'plugin://plugin.video.youtube/play/?video_id='+ page_url.split('=')[-1]]]
+    video_urls = []
 
+    inputstream = platformtools.install_inputstream()
 
-    # video_id = scrapertools.find_single_match(page_url, '(?:v=|embed/)([A-z0-9_-]{11})')
-    # inputstream = platformtools.install_inputstream()
+    try:
+        __settings__ = Addon(name)
+        if inputstream: __settings__.setSetting('kodion.video.quality.mpd', 'true')
+        else: __settings__.setSetting('kodion.video.quality.mpd', 'false')
+        # video_urls = [['con YouTube', 'plugin://plugin.video.youtube/play/?video_id=' + video_id ]]
+    except:
+        path = xbmc.translatePath('special://home/addons/' + name)
+        if filetools.exists(path):
+            if platformtools.dialog_yesno(config.get_localized_string(70784), config.get_localized_string(70818)):
+                xbmc.executeJSONRPC('{"jsonrpc": "2.0", "id":1, "method": "Addons.SetAddonEnabled", "params": { "addonid": "' + name + '", "enabled": true }}')
+            else: return [['','']]
+        else:
+            xbmc.executebuiltin('InstallAddon(' + name + ')', wait=True)
+            try: Addon(name)
+            except: return [['','']]
+    my_addon = xbmcaddon.Addon('plugin.video.youtube')
+    addon_dir = xbmc.translatePath( my_addon.getAddonInfo('path') )
+    sys.path.append(filetools.join( addon_dir, 'resources', 'lib' ) )
 
-    # try:
-    #     __settings__ = Addon(name)
-    #     if inputstream: __settings__.setSetting('kodion.video.quality.mpd', 'true')
-    #     else: __settings__.setSetting('kodion.video.quality.mpd', 'false')
-    #     # video_urls = [['con YouTube', 'plugin://plugin.video.youtube/play/?video_id=' + video_id ]]
-    # except:
-    #     path = xbmc.translatePath('special://home/addons/' + name)
-    #     if filetools.exists(path):
-    #         if platformtools.dialog_yesno(config.get_localized_string(70784), config.get_localized_string(70818)):
-    #             xbmc.executeJSONRPC('{"jsonrpc": "2.0", "id":1, "method": "Addons.SetAddonEnabled", "params": { "addonid": "' + name + '", "enabled": true }}')
-    #         else: return [['','']]
-    #     else:
-    #         xbmc.executebuiltin('InstallAddon(' + name + ')', wait=True)
-    #         try: Addon(name)
-    #         except: return [['','']]
-    # my_addon = xbmcaddon.Addon('plugin.video.youtube')
-    # addon_dir = xbmc.translatePath( my_addon.getAddonInfo('path') )
-    # sys.path.append(filetools.join( addon_dir, 'resources', 'lib' ) )
-
-    # # load all dependencies for yt addon
-    # dependencies = support.match(filetools.read(filetools.join(addon_dir, 'addon.xml')), patron=r'addon="([^"]+)').matches
-    # for dep in dependencies:
-    #     sys.path.append(filetools.join(config.get_runtime_path(), '..', dep, 'lib'))
-    #     sys.path.append(filetools.join(config.get_runtime_path(), '..', dep, 'resources', 'modules'))
-    # from youtube_resolver import resolve
-    # try:
-    #     for stream in resolve(page_url):
-    #         # title = scrapertools.find_single_match(stream['title'], '(\d+p)')
-    #         if scrapertools.find_single_match(stream['title'], r'(\d+p)'):
-    #             video_urls.append([re.sub(r'(\[[^\]]+\])', '', stream['title']), stream['url']])
-    #     video_urls.sort(key=lambda it: int(it[0].split("p", 1)[0]))
-    # except:
-    #     pass
+    # load all dependencies for yt addon
+    dependencies = support.match(filetools.read(filetools.join(addon_dir, 'addon.xml')), patron=r'addon="([^"]+)').matches
+    for dep in dependencies:
+        sys.path.append(filetools.join(config.get_runtime_path(), '..', dep, 'lib'))
+        sys.path.append(filetools.join(config.get_runtime_path(), '..', dep, 'resources', 'modules'))
+    from youtube_resolver import resolve
+    try:
+        for stream in resolve(page_url):
+            # title = scrapertools.find_single_match(stream['title'], '(\d+p)')
+            if scrapertools.find_single_match(stream['title'], r'(\d+p)'):
+                video_urls.append([re.sub(r'(\[[^\]]+\])', '', stream['title']), stream['url']])
+        video_urls.sort(key=lambda it: int(it[0].split("p", 1)[0]))
+    except:
+        pass
 
     return video_urls