diff --git a/CHANGES.md b/CHANGES.md
index ae054e20d7..3e6038a422 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
 # Apache Roller — Changes
 
+### Bug fixes
+
+- **Remove Move jQuery validate email address from roller.js and add to page**
+  Validation should be done on the pages that need ie have an email field, rather than in the global
+  roller.js.  Stops js errors on pages with no jquery-validate js script.
+
 ## 6.1.7
 
 ### Improvements
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
index b574975fc5..2421603f62 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
@@ -90,6 +90,27 @@
 
     $( document ).ready(function() {
 
+        jQuery("form.validate-form").validate();
+        // Added method to check valid email address and add a custom error message
+        jQuery.validator.addMethod(
+            "regex",
+            function(value, element, regexp)  {
+                if (regexp && regexp.constructor != RegExp) {
+                    regexp = new RegExp(regexp);
+                } else if (regexp.global) {
+                    regexp.lastIndex = 0;
+                }
+                return this.optional(element) || regexp.test(value);
+            }
+        );
+        // Applied email rules to field with class name validate-email
+        jQuery( ".validate-email" ).rules( "add", {
+            minlength: 3,
+            maxlength: 255,
+            email: true,
+            regex: /^\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b$/i
+        });
+
         saveButton = $("#createWeblog_0");
 
         <s:if test="bean.theme == null">
diff --git a/app/src/main/webapp/theme/scripts/roller.js b/app/src/main/webapp/theme/scripts/roller.js
index 357fb5b8c8..af640acfaf 100644
--- a/app/src/main/webapp/theme/scripts/roller.js
+++ b/app/src/main/webapp/theme/scripts/roller.js
@@ -237,25 +237,3 @@ function actionErrors(html) {
         return error.textContent.trim();
     });
 }
-$(document).ready(function () {
-    jQuery("form.validate-form").validate();
-    // Added method to check valid email address and add a custom error message
-    jQuery.validator.addMethod(
-        "regex",
-        function(value, element, regexp)  {
-            if (regexp && regexp.constructor != RegExp) {
-                regexp = new RegExp(regexp);
-            } else if (regexp.global) {
-                regexp.lastIndex = 0;
-            }
-            return this.optional(element) || regexp.test(value);
-        }
-    );
-    // Applied email rules to field with class name validate-email
-    jQuery( ".validate-email" ).rules( "add", {
-        minlength: 3,
-        maxlength: 255,
-        email: true,
-        regex: /^\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b$/i
-    });
-});