diff --git a/TGS.Installer.UI/Main.cs b/TGS.Installer.UI/Main.cs
index 324459bc99..5d33a7f5d0 100644
--- a/TGS.Installer.UI/Main.cs
+++ b/TGS.Installer.UI/Main.cs
@@ -384,7 +384,9 @@ namespace TGS.Installer.UI
 					Microsoft.Deployment.WindowsInstaller.Installer.EnableLog(InstallLogModes.Verbose | InstallLogModes.PropertyDump, logfile);
 				}
 				var cl = String.Join(" ", args);
-				Microsoft.Deployment.WindowsInstaller.Installer.SetInternalUI(InstallUIOptions.Silent);
+
+				// TODO: Uncomment this when OnUIUpdate is more robust
+				// Microsoft.Deployment.WindowsInstaller.Installer.SetInternalUI(InstallUIOptions.Silent);
 				Microsoft.Deployment.WindowsInstaller.Installer.SetExternalUI(OnUIUpdate, InstallLogModes.Progress);
 
 				await Task.Factory.StartNew(() => Microsoft.Deployment.WindowsInstaller.Installer.InstallProduct(msipath, cl));
diff --git a/TGS.Server.Service/Service.cs b/TGS.Server.Service/Service.cs
index af88d24b50..2314595060 100644
--- a/TGS.Server.Service/Service.cs
+++ b/TGS.Server.Service/Service.cs
@@ -19,6 +19,14 @@ namespace TGS.Server.Service
 		/// </summary>
 		Server activeServer;
 
+		/// <summary>
+		/// Constructs a <see cref="Service"/>
+		/// </summary>
+		Service()
+		{
+			ServiceName = "TG Station Server";
+		}
+
 		/// <inheritdoc />
 		public void WriteAccess(string username, bool authSuccess, byte loggingID)
 		{
diff --git a/TGS.Server/Server.cs b/TGS.Server/Server.cs
index 5098a590d7..b500bf3fa0 100644
--- a/TGS.Server/Server.cs
+++ b/TGS.Server/Server.cs
@@ -164,6 +164,7 @@ namespace TGS.Server
 		/// </summary>
 		void SetupConfig()
 		{
+			Directory.CreateDirectory(DefaultConfigDirectory);
 			try
 			{
 				Config = ServerConfig.Load(DefaultConfigDirectory);