diff --git a/Teknik/Areas/TOS/Views/Shared/Index.cshtml b/Teknik/Areas/TOS/Views/TOS/Index.cshtml
similarity index 64%
rename from Teknik/Areas/TOS/Views/Shared/Index.cshtml
rename to Teknik/Areas/TOS/Views/TOS/Index.cshtml
index 2c59cd1..9796aab 100644
--- a/Teknik/Areas/TOS/Views/Shared/Index.cshtml
+++ b/Teknik/Areas/TOS/Views/TOS/Index.cshtml
@@ -6,19 +6,25 @@
         <div class="col-xs-10">
             <h2>Terms of Service for Teknik Services</h2>
             <p>
-                Below are the terms of service for the Teknik Services.  By using our services, you agree to all of the below terms.
+                Below are the terms of service for the Teknik Services.  By using our services, you agree to all of the below.
             </p>
             <ul>
                 <li>No illegal content as defined by United States law.  If you are viewing content, be mindful of the laws in your region.</li>
                 <li>Any Malware uploads or otherwise hosted/linked content will be removed without notice.</li>
                 <li>Email is limited to a maximum of 100 outbound email messages per day.  This is to prevent spam accounts.  If your account is flagged as spamming, it will be deleted without notice.</li>
                 <li>Copyrighted content will be removed only after a valid DMCA is recieved and verified.</li>
+                <li>Inactive Accounts with no data will be deleted after 180 days.
+                    <ul>
+                        <li>Activity is defined as logging into the Teknik Website, into the Git website, or into the mail service (Either through webmail or via another client).</li>
+                        <li>Data is defined as Blog Posts/Comments, Podcast Comments, Emails, and Git Repositories.</li>
+                    </ul>
+                </li>
             </ul>
         </div>
     </div>
     <div class="row">
         <div class="col-xs-10">
-            <p><i>Last Modified May 8, 2016</i></p>
+            <p><i>Last Modified May 18, 2016</i></p>
         </div>
     </div>
 </div>
diff --git a/Teknik/Areas/User/Views/User/Register.cshtml b/Teknik/Areas/User/Views/User/Register.cshtml
index 7b2ed92..06c7af5 100644
--- a/Teknik/Areas/User/Views/User/Register.cshtml
+++ b/Teknik/Areas/User/Views/User/Register.cshtml
@@ -19,7 +19,13 @@
             <input type="password" class="form-control" id="registerConfirmPassword" value="" placeholder="Confirm Password" name="Register.ConfirmPassword" data-val-required="The Confirm Password field is required." data-val="true" />
         </div>
         <p class="text-center">
-            By registering for Teknik, you agree to the <a href="@Url.SubRouteUrl("tos", "TOS.Index")">Terms of Service</a>.
+            <small>
+                Username must match the following pattern <var>@Model.Config.UserConfig.UsernameFilter</var><br />
+                and the length must be greater than <b>@Model.Config.UserConfig.MinUsernameLength</b> and less than <b>@Model.Config.UserConfig.MaxUsernameLength</b> characters
+            </small>
+        </p>
+        <p class="text-center">
+            By registering for Teknik, you agree to the <a href="@Url.SubRouteUrl("tos", "TOS.Index")" target="_blank">Terms of Service</a>.
         </p>
         <div class="form-group text-center">
             <button class="btn btn-primary" id="registerSubmit" type="submit" name="Register.Submit">Sign Up</button>
diff --git a/Teknik/Teknik.csproj b/Teknik/Teknik.csproj
index 13a5836..02f8d19 100644
--- a/Teknik/Teknik.csproj
+++ b/Teknik/Teknik.csproj
@@ -521,7 +521,7 @@
     <Content Include="Areas\Help\Views\Help\API\v1\Shorten.cshtml" />
     <Content Include="Areas\TOS\Views\web.config" />
     <Content Include="Areas\TOS\Views\_ViewStart.cshtml" />
-    <Content Include="Areas\TOS\Views\Shared\Index.cshtml" />
+    <Content Include="Areas\TOS\Views\TOS\Index.cshtml" />
     <None Include="Properties\PublishProfiles\Teknik Dev.pubxml" />
     <None Include="Properties\PublishProfiles\Teknik Production.pubxml" />
     <None Include="Scripts\jquery-2.1.4.intellisense.js" />
@@ -615,7 +615,7 @@
     <Folder Include="Areas\Shortener\Views\Shared\" />
     <Folder Include="Areas\Stream\Views\Shared\" />
     <Folder Include="Areas\TOS\Models\" />
-    <Folder Include="Areas\TOS\Views\TOS\" />
+    <Folder Include="Areas\TOS\Views\Shared\" />
     <Folder Include="Areas\Transparency\Views\Shared\" />
     <Folder Include="Areas\Upload\Views\Shared\" />
     <Folder Include="Areas\User\Repositories\" />