diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js
new file mode 100644
index 000000000..4c1f684fa
--- /dev/null
+++ b/webapp/web/js/login/loginUtils.js
@@ -0,0 +1,10 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+
+$(document).ready(function(){
+
+	$("#formLogin").removeClass("hidden");
+
+});
+
+
diff --git a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
index 15289260b..5ed2d012b 100644
--- a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
@@ -9,13 +9,13 @@ ${stylesheets.addFromTheme("/login.css")}
        <h2>Create Your New Password</h2>
        
        <#if errorMessage??>
-           <div id="errorAlert"><img src="${alertImageUrl}" width="24" height="24" alert="Error alert icon"/>
+           <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
                   <p>${errorMessage}</p>
            </div>
        </#if>
        
-       <form action="${formAction}" method="post" onsubmit="return isReasonableNewPassword(this)">
-              <label for="newPassword">Password</label>
+       <form action="${formAction}" method="post">
+              <label for="newPassword">New Password</label>
               <input type="password" name="newPassword"  />
               <p class="passwordNote">Please enter a password with more than 5 characters</p>
               <label for="confirmPassword">Confirm Password</label>
diff --git a/webapp/web/templates/freemarker/body/login/login-form.ftl b/webapp/web/templates/freemarker/body/login/login-form.ftl
index 7f225e307..2ba6db75e 100644
--- a/webapp/web/templates/freemarker/body/login/login-form.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-form.ftl
@@ -2,10 +2,19 @@
 
 <#-- Log in template for accessing site admin -->
 
-${stylesheets.addFromTheme("/login.css")}
-<noscript><p class="alertNoJavaScript">JavaScript must be enabled in order for you to log in. However, it seems JavaScript is either disabled or not supported by your browser. Please enable JavaScript by changing your browser options.</p></noscript>
 
-<div id="formLogin" class="pageBodyGroup">
+
+${stylesheets.addFromTheme("/login.css")}
+<noscript>
+	<div id="javascriptDisableWrapper">
+		<div id="javascriptDisableContent">
+			<img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
+			<p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
+		</div>
+	</div>
+</noscript>
+
+<div id="formLogin" class="pageBodyGroup hidden" >
 
        <h2>Log in</h2>
        
@@ -14,12 +23,12 @@ ${stylesheets.addFromTheme("/login.css")}
        </#if>
        
        <#if errorMessage??>
-           <div id="errorAlert"><img src="${alertImageUrl}" width="24" height="24" alert="Error alert icon"/>
+           <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"  alert="Error alert icon"/>
                   <p>${errorMessage}</p>
            </div>
        </#if>
        
-       <form action="${formAction}" method="post" onsubmit="return isValidLogin(this)">
+       <form action="${formAction}" method="post">
               <label for="loginName">Email</label>
               <input name="loginName" type="text" value="${loginName}"  />
               <label for="loginPassword">Password</label>
@@ -28,3 +37,6 @@ ${stylesheets.addFromTheme("/login.css")}
        </form>
 </div>
 
+
+
+