diff --git a/webtools/PLIF/output/http/login.detailsSent b/webtools/PLIF/output/http/login.detailsSent
index 5ac601981269..211361a230bb 100644
--- a/webtools/PLIF/output/http/login.detailsSent
+++ b/webtools/PLIF/output/http/login.detailsSent
@@ -5,6 +5,7 @@ TemplateToolkit
 
   <p>Your password has been sent.</p>
 
+  [% IF pendingCommands.defined %]
   <form action="" method="GET"> <!-- XXX POST -->
    <p>
     <input type="submit" value="Continue...">
@@ -13,5 +14,8 @@ TemplateToolkit
     [%- END -%] [%- END %]
    </p>
   </form>
+  [% ELSE %]
+  <p><a href="?">Return to index.</a></p>
+  [% END %]
 
 [% INCLUDE template.html.footer %]
diff --git a/webtools/PLIF/output/http/login.failed b/webtools/PLIF/output/http/login.failed
index 2747123869e3..e2abec6ba1a1 100644
--- a/webtools/PLIF/output/http/login.failed
+++ b/webtools/PLIF/output/http/login.failed
@@ -17,6 +17,7 @@ TemplateToolkit
 
    <p>
     [%- INCLUDE template.html.login.form buttonLabel = 'Get Password' %]
+    <input type="hidden" name="loginPendingCommands" value="[% pendingCommands | html %]">
    </p>
   </form>
 
diff --git a/webtools/PLIF/output/http/template.html.login.form b/webtools/PLIF/output/http/template.html.login.form
index d2d7724b485f..384aa4ebcd7e 100644
--- a/webtools/PLIF/output/http/template.html.login.form
+++ b/webtools/PLIF/output/http/template.html.login.form
@@ -8,5 +8,4 @@ TemplateToolkit
      [%- END %]
     </select>
     <input type="text" name="address" value="">
-    <input type="hidden" name="loginPendingCommands" value="[% pendingCommands | html %]">
     <input type="submit" value="[% buttonLabel | html %]">