diff --git a/mozilla/webtools/PLIF/output/http/login.detailsSent b/mozilla/webtools/PLIF/output/http/login.detailsSent
index ce35d39db0a..5ac60198126 100644
--- a/mozilla/webtools/PLIF/output/http/login.detailsSent
+++ b/mozilla/webtools/PLIF/output/http/login.detailsSent
@@ -5,11 +5,11 @@ TemplateToolkit
 
   <p>Your password has been sent.</p>
 
-  <form >
+  <form action="" method="GET"> <!-- XXX POST -->
    <p>
     <input type="submit" value="Continue...">
     [%- FOREACH key = pendingCommands.keys -%] [%- FOREACH value = pendingCommands.$key %]
-    <input type="hidden" name="[% key %]" value="[% value %]">
+    <input type="hidden" name="[% key | html %]" value="[% value | html %]">
     [%- END -%] [%- END %]
    </p>
   </form>
diff --git a/mozilla/webtools/PLIF/output/http/template.html.header b/mozilla/webtools/PLIF/output/http/template.html.header
index d65a7785ce4..44c577d2e88 100644
--- a/mozilla/webtools/PLIF/output/http/template.html.header
+++ b/mozilla/webtools/PLIF/output/http/template.html.header
@@ -11,11 +11,11 @@ Content-Type: text/html
   <title>[% app.name %][% IF title != app.name %]: [% title %][% END %]</title>
   <link rel="stylesheet" href="style">
 [% IF session.fields.settings.stylesheet != '' -%]
-  <link rel="stylesheet" href="[% session.fields.settings.stylesheet %]">
+  <link rel="stylesheet" href="[% session.fields.settings.stylesheet | uri | html %]">
 [% END -%]
  </head>
  <body>
-  <h1>[% title %]</h1>
+  <h1>[% title | html %]</h1>
 [%- IF session.adminMessage != '' %]
-  <p class="adminMessage">[% session.adminMessage %]</p>
+  <p class="adminMessage">[% session.adminMessage | html %]</p>
 [% END -%]
diff --git a/mozilla/webtools/PLIF/output/http/template.html.login.form b/mozilla/webtools/PLIF/output/http/template.html.login.form
index cb04ae190e0..d2d7724b485 100644
--- a/mozilla/webtools/PLIF/output/http/template.html.login.form
+++ b/mozilla/webtools/PLIF/output/http/template.html.login.form
@@ -4,9 +4,9 @@ TemplateToolkit
     <input type="hidden" name="command" value="loginSendPassword">
     <select name="protocol">
      [%- FOREACH protocol = contacts.sort %]
-     <option name="[% protocol %]">[% protocol %]</option>
+     <option name="[% protocol | html %]">[% protocol | html %]</option>
      [%- END %]
     </select>
     <input type="text" name="address" value="">
-    <input type="hidden" name="loginPendingCommands" value="[% pendingCommands %]">
-    <input type="submit" value="[% buttonLabel %]">
+    <input type="hidden" name="loginPendingCommands" value="[% pendingCommands | html %]">
+    <input type="submit" value="[% buttonLabel | html %]">
