diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs
index 44b33594..50c442cb 100644
--- a/TShockAPI/Rest/RestManager.cs
+++ b/TShockAPI/Rest/RestManager.cs
@@ -300,8 +300,8 @@ namespace TShockAPI
 				return RestMissingParam("user");
 
 			var group = parameters["group"];
-			if (string.IsNullOrWhiteSpace(group))
-				return RestMissingParam("group");
+		    if (string.IsNullOrWhiteSpace(group))
+		        group = TShock.Config.DefaultRegistrationGroupName;
 
 			var password = parameters["password"];
 			if (string.IsNullOrWhiteSpace(password))
diff --git a/TShockAPI/Rest/SecureRest.cs b/TShockAPI/Rest/SecureRest.cs
index 2edf3013..3569ac63 100644
--- a/TShockAPI/Rest/SecureRest.cs
+++ b/TShockAPI/Rest/SecureRest.cs
@@ -55,7 +55,7 @@ namespace Rests
 			}
 
 			// TODO: Get rid of this when the old REST permission model is removed.
-			if (!TShock.Config.RestUseNewPermissionModel)
+			if (TShock.Config.RestApiEnabled && !TShock.Config.RestUseNewPermissionModel)
 			{
 				string warningMessage = string.Concat(
 					"You're using the old REST permission model which is highly vulnerable in matter of security. ",
@@ -67,7 +67,7 @@ namespace Rests
 				Console.WriteLine(warningMessage);
 				Console.ForegroundColor = ConsoleColor.Gray;
 			}
-			else
+			else if (TShock.Config.RestApiEnabled)
 			{
 				string warningMessage = string.Concat(
 					"You're using the new more secure REST permission model which can lead to compatibility problems ",
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index ab4c32bf..e223ac2f 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -76,7 +76,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="TerrariaServer">
+    <Reference Include="TerrariaServer, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <ExecutableExtension>.exe</ExecutableExtension>
       <HintPath>..\TerrariaServerBins\TerrariaServer.exe</HintPath>
     </Reference>
   </ItemGroup>
@@ -191,7 +193,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
+      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/TerrariaServerBins/TerrariaServer.exe b/TerrariaServerBins/TerrariaServer.exe
index 65df1f35..c9081b0e 100644
Binary files a/TerrariaServerBins/TerrariaServer.exe and b/TerrariaServerBins/TerrariaServer.exe differ