diff --git a/MediaBrowser.Common.Implementations/Updates/GithubUpdater.cs b/MediaBrowser.Common.Implementations/Updates/GithubUpdater.cs
index 82ebf92b2..2ffaedc4b 100644
--- a/MediaBrowser.Common.Implementations/Updates/GithubUpdater.cs
+++ b/MediaBrowser.Common.Implementations/Updates/GithubUpdater.cs
@@ -111,7 +111,8 @@ namespace MediaBrowser.Common.Implementations.Updates
                     targetFilename = targetFilename,
                     versionStr = version.ToString(),
                     requiredVersionStr = "1.0.0",
-                    description = obj.body
+                    description = obj.body,
+                    infoUrl = obj.html_url
                 }
             };
         }
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index b9bf6e7fe..22404b6f6 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -87,5 +87,7 @@ namespace MediaBrowser.Model.Updates
         /// </summary>
         /// <value>The target filename.</value>
         public string targetFilename { get; set; }
+
+        public string infoUrl { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index 918110226..9e68ce4ef 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -116,7 +116,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
 
             var notification = new NotificationRequest
             {
-                NotificationType = type
+                NotificationType = type,
+                Url = e.Argument.infoUrl
             };
 
             notification.Variables["Version"] = e.Argument.versionStr;
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index a654bd2b5..f1a2915fe 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -110,7 +110,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="MainStartup.cs" />
-    <Compile Include="Native\Autorun.cs" />
     <Compile Include="Native\Standby.cs" />
     <Compile Include="Native\ServerAuthorization.cs" />
     <Compile Include="Native\WindowsApp.cs" />
diff --git a/MediaBrowser.ServerApplication/Native/Autorun.cs b/MediaBrowser.ServerApplication/Native/Autorun.cs
deleted file mode 100644
index 4d3f66b91..000000000
--- a/MediaBrowser.ServerApplication/Native/Autorun.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.IO;
-using CommonIO;
-
-namespace MediaBrowser.ServerApplication.Native
-{
-    /// <summary>
-    /// Class Autorun
-    /// </summary>
-    public static class Autorun
-    {
-        /// <summary>
-        /// Configures the specified autorun.
-        /// </summary>
-        /// <param name="autorun">if set to <c>true</c> [autorun].</param>
-        /// <param name="fileSystem">The file system.</param>
-        public static void Configure(bool autorun, IFileSystem fileSystem)
-        {
-            var shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk");
-
-            var startupPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
-
-            if (autorun)
-            {
-                //Copy our shortut into the startup folder for this user
-                File.Copy(shortcutPath, Path.Combine(startupPath, Path.GetFileName(shortcutPath) ?? "Emby Server.lnk"), true);
-            }
-            else
-            {
-                //Remove our shortcut from the startup folder for this user
-                fileSystem.DeleteFile(Path.Combine(startupPath, Path.GetFileName(shortcutPath) ?? "Emby Server.lnk"));
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index 056258f96..146a4372b 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Startup.Common;
 using MediaBrowser.ServerApplication.Networking;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using CommonIO;
 using MediaBrowser.Controller.Power;
@@ -108,7 +109,22 @@ namespace MediaBrowser.ServerApplication.Native
 
         public void ConfigureAutoRun(bool autorun)
         {
-            Autorun.Configure(autorun, _fileSystem);
+            var shortcutPath = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk");
+
+            var startupPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Startup);
+
+            if (autorun)
+            {
+                //Copy our shortut into the startup folder for this user
+                var targetPath = Path.Combine(startupPath, Path.GetFileName(shortcutPath) ?? "Emby Server.lnk");
+                _fileSystem.CreateDirectory(Path.GetDirectoryName(targetPath));
+                File.Copy(shortcutPath, targetPath, true);
+            }
+            else
+            {
+                //Remove our shortcut from the startup folder for this user
+                _fileSystem.DeleteFile(Path.Combine(startupPath, Path.GetFileName(shortcutPath) ?? "Emby Server.lnk"));
+            }
         }
 
         public INetworkManager CreateNetworkManager(ILogger logger)