diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
index 019b28872..5b6ca1f53 100644
--- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
+++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
@@ -174,10 +174,14 @@ public class UrlHelper {
             buildParametersString(params, link, "&");
         } 
 
-        String result;
-
+        String result = link.toString();
+        
+        if (result.indexOf("<script>") >= 0){
+        	result = result.replaceAll("<script>", "script");
+        }
+        
         try {
-            result = encodeResult ? response.encodeURL(link.toString()) : link.toString();
+            result = encodeResult ? response.encodeURL(result) : result;
         } catch (Exception ex) {
             // Could not encode the URL for some reason
             // Use it unchanged