diff --git a/ldregistry/templates/actions/create-redirect-page.vm b/ldregistry/templates/actions/create-redirect-page.vm
index d596f1b..1d3bcf2 100644
--- a/ldregistry/templates/actions/create-redirect-page.vm
+++ b/ldregistry/templates/actions/create-redirect-page.vm
@@ -9,7 +9,7 @@
     <div class="col-md-10 col-md-offset-1 modal-page-panel">
     
         <div class="modal-page-head">
-            <h3>$msg.get('redirect.heading', $entity)</h3>
+            <h3>$msg.get('redirect.heading', $lib.reg.xssCleanHTML($entity))</h3>
         </div>
 
         <div class="modal-page-body">
diff --git a/ldregistry/templates/login.vm b/ldregistry/templates/login.vm
index 563d418..d85d7c4 100644
--- a/ldregistry/templates/login.vm
+++ b/ldregistry/templates/login.vm
@@ -14,8 +14,6 @@
     #set( $lroot = $root )
 #end
 
-#set( $return = $lib.reg.xssCleanURI($return) )
-
 <div class="modal-page container">
   <div class="row">
     <div class="col-md-12 modal-page-panel">
@@ -50,7 +48,7 @@
                       <input type="password" class="form-control" id="password1" name="password" placeholder="$msg['user.password.label']">
                     </div>
                   </div>
-                  <input type="hidden" name="return" value="$return" />
+                  <input type="hidden" name="return" value="$lib.reg.xssCleanHTMLAtribute($return)" />
                   <div class="form-group">
                     <div class="col-md-offset-1 col-md-10">
                       <button type="submit" class="btn btn-default">$msg['login.button']</button>
@@ -66,7 +64,7 @@
 				    <p>$msg['login.oauth.note']</p>
 				  #end
 				  #foreach($provider in $oauthProviders)
-                    #oauthLogin($provider, $return)
+                    #oauthLogin($provider, $lib.reg.xssCleanHTMLAtribute($return))
                   #end
                 </div>
               </div>
@@ -99,7 +97,7 @@
                       <input type="password" class="form-control" id="password2" name="password" placeholder="$msg['user.password.label']">
                     </div>
                   </div>
-                  <input type="hidden" name="return" value="$return" />
+                  <input type="hidden" name="return" value="$lib.reg.xssCleanHTMLAtribute($return)" />
                   <div class="form-group">
                     <div class="col-md-offset-1 col-md-10">
                       <button type="submit" class="btn btn-default">$msg['login.register.button']</button>
@@ -114,7 +112,7 @@
                   	<p>$msg['login.register.oauth']</p>
                   #end
                   #foreach($provider in $oauthProviders)
-                    #oauthRegister($provider, $return)
+                    #oauthRegister($provider, $lib.reg.xssCleanHTMLAtribute($return))
                   #end
                 </div>
               </div>
@@ -134,7 +132,7 @@
       <div class="modal-page-footer">
         <div class="row">
           <div class="col-md-offset-10 col-md-1">
-            <a href="#if($return)$return#else$root#end" class="btn">$msg['ui.close']</a>
+            <a href="#if($return)$lib.reg.xssCleanURI($return)#else$root#end" class="btn">$msg['ui.close']</a>
           </div>
         </div>
       </div>