diff --git a/controllers/user.js b/controllers/user.js
index c37df6e1a..d15b00d5a 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -723,6 +723,7 @@ exports.newScriptPage = function (aReq, aRes, aNext) {
   options.newUserJS = true;
   options.newScriptEditorPageUrl = '/user/add/scripts/new';
   options.uploadNewScriptPageUrl = '/user/add/scripts/upload';
+  options.maximumUploadScriptSize = settings.maximum_upload_script_size;
 
   // Page metadata
   pageMetadata(options, 'New Script');
@@ -753,6 +754,7 @@ exports.newLibraryPage = function (aReq, aRes, aNext) {
   options.newJSLibrary = true;
   options.newScriptEditorPageUrl = '/user/add/lib/new';
   options.uploadNewScriptPageUrl = '/user/add/lib/upload';
+  options.maximumUploadScriptSize = settings.maximum_upload_script_size;
 
   // Page metadata
   pageMetadata(options, 'New Library');
diff --git a/views/pages/loginPage.html b/views/pages/loginPage.html
index 35171f0b4..d8d41c88b 100644
--- a/views/pages/loginPage.html
+++ b/views/pages/loginPage.html
@@ -43,7 +43,7 @@ <h3>
           </span>
         </div>
         <div class="alert alert-warning" role="alert">
-          <strong>CAUTION</strong>: The unique Username that you choose to sign up with here will be displayed to everyone. It is strongly recommended to <strong>not</strong> use an email address.
+          <i class="fa fa-exclamation-triangle"></i> <strong>CAUTION</strong>: The unique Username that you choose to sign up with here will be displayed to everyone. It is strongly recommended to <strong>not</strong> use an email address.
         </div>
       </form>
     </div>
diff --git a/views/pages/newScriptPage.html b/views/pages/newScriptPage.html
index 0d39b4565..efbe88c3d 100644
--- a/views/pages/newScriptPage.html
+++ b/views/pages/newScriptPage.html
@@ -39,7 +39,7 @@ <h4 class="list-group-item-heading"><code>@icon url</code></h4>
             </div>
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@license License Type; License Homepage</code></h4>
-              <p class="list-group-item-text">Specially formatted on the script page. All values shown in reverse order. If absent MIT License (Expat) is implied.</p>
+              <p class="list-group-item-text">Specially formatted on the script page. All values shown in reverse order. If absent MIT License (Expat) is implied. See <a href="/about/Terms-of-Service#licensing">licensing terms</a> for specifics.</p>
             </div>
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@homepageURL url</code></h4>
@@ -72,7 +72,7 @@ <h2><i class="fa fa-question"></i> Library Docs</h2>
           <div class="panel panel-default">
             <div class="panel-body">
               <h3>OpenUserJS.org Supported</h3>
-              <p>Any <a href="/about/Userscript-Beginners-HOWTO#what-is-a-userscript-">UserScript</a> on OpenUserJS.org that <code>//@require</code>'s libraries from OpenUserJS.org will link to the library on the UserScript page.</p>
+              <p>Any UserScript on OpenUserJS.org that <code>//@require</code>'s libraries from OpenUserJS.org will link to the library on the UserScript page.</p>
             </div>
           </div>
           {{/newJSLibrary}}
@@ -125,6 +125,9 @@ <h4 class="list-group-item-heading"><i class="octicon octicon-fw octicon-repo-cl
                 Click here to import a script<em>(s)</em> from a GitHub repository.
               </p>
             </a>
+            <div role="alert" class="alert alert-info">
+              <i class="octicon octicon-fw octicon-info"></i> <strong>LIMITS</strong>: The current upload size limit is set at <span class="label label-default">{{maximumUploadScriptSize}} bytes</span> per script.
+            </div>
           </div>
         </div>
         <div class="col-md-4">