From 085c3997c33b6aeb55eed0fee6db11b243a20081 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 6 Feb 2015 16:51:13 -0800
Subject: [PATCH] ng selfservice contact login, RT#27943

---
 ng_selfservice/index.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ng_selfservice/index.php b/ng_selfservice/index.php
index ec5468666..540f1f800 100644
--- a/ng_selfservice/index.php
+++ b/ng_selfservice/index.php
@@ -10,6 +10,7 @@ extract($login_info);
 $error = $_GET['error'];
 if ( $error ) {
   $username = $_GET['username'];
+  $email    = $_GET['email'];
   $domain   = $_GET['domain'];
 }
 
@@ -22,23 +23,23 @@ if ( $error ) {
 
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
 
-<TR>
-  <TH ALIGN="right">Username </TH>
-  <TD>
-    <INPUT TYPE="text" NAME="username" VALUE="<? echo htmlspecialchars($username); ?>"><? if ( $single_domain ) { echo '@'.$single_domain; } ?>
-  </TD>
-</TR>
-
 <? if ( $single_domain ) { ?>
 
+  <TR>
+    <TH ALIGN="right">Username </TH>
+    <TD>
+      <INPUT TYPE="text" NAME="username" VALUE="<? echo htmlspecialchars($username); ?>"><? if ( $single_domain ) { echo '@'.$single_domain; } ?>
+    </TD>
+<  /TR>
+
   <INPUT TYPE="hidden" NAME="domain" VALUE="<? echo $single_domain ?>">
 
 <? } else { ?>
 
   <TR>
-    <TH ALIGN="right">Domain </TH>
+    <TH ALIGN="right">Email address </TH>
     <TD>
-      <INPUT TYPE="text" NAME="domain" VALUE="<? echo htmlspecialchars($domain); ?>">
+      <INPUT TYPE="text" NAME="email" VALUE="<? echo htmlspecialchars($email); ?>">
     </TD>
   </TR>
 
-- 
2.11.0