diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateDelegatedUIJavaScripts.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateDelegatedUIJavaScripts.mtl
index d6f1600..1e9ebf8 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateDelegatedUIJavaScripts.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateDelegatedUIJavaScripts.mtl
@@ -162,7 +162,7 @@
 
 
 function respondWithWindowName(/*string*/ response) {
-   var returnURL = window.name;
+   var returnURL = escapeCSSAttack(window.name);
    window.name = response;
    window.location.href = returnURL;
 
@@ -179,5 +179,23 @@
 function cancel(){
   sendCancelResponse();
 }
+
+function escapeCSSAttack(url) {
+    var out = "";
+    for(var i=0; i<url.length; i++) {
+        if(url['[i]'/] === '<') {
+            out += '&amp;lt;';
+        } else if(url['[i]'/] === '>') {
+            out += '&amp;gt;';
+        } else if(url['[i]'/] === "'") {
+            out += '&amp;#39;'; 
+        } else if(url['[i]'/] === '"') {
+            out += '&amp;quot;';                        
+        } else {
+            out += url['[i]'/];
+        }
+    }
+    return out;                    
+}
 [/file]
 [/template]