--- loncom/interface/createaccount.pm	2009/03/12 13:59:49	1.30
+++ loncom/interface/createaccount.pm	2009/03/12 14:13:34	1.31
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.30 2009/03/12 13:59:49 raeburn Exp $
+# $Id: createaccount.pm,v 1.31 2009/03/12 14:13:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -467,22 +467,24 @@ sub login_box {
     my $upassform = '<input type="password" name="upass'.$now.'" size="10" />';
     $output .= '<form name="client" method="post" action="/adm/createaccount">'."\n".
                &Apache::lonhtmlcommon::start_pick_box()."\n";
-    if ($context eq 'selfenroll') {
-        my $udomform =  '<input type="text" name="udom" size="10" value="'.
-                        $domain.'" />';
-        $output .= &Apache::lonhtmlcommon::row_title(&mt('Domain'),
-                                                     'LC_pick_box_title')."\n".
-                   $udomform."\n".
-                   &Apache::lonhtmlcommon::row_closure(1)."\n";
-    }
-
     $output .= &Apache::lonhtmlcommon::row_title($titles{$context},
                                                  'LC_pick_box_title')."\n".
                $unameform."\n".
                &Apache::lonhtmlcommon::row_closure(1)."\n".
                &Apache::lonhtmlcommon::row_title(&mt('Password'),
                                                 'LC_pick_box_title')."\n".
-               $upassform."\n".'<br /><br />'."\n".
+               $upassform;
+    if ($context eq 'selfenroll') {
+        my $udomform =  '<input type="text" name="udom" size="10" value="'.
+                        $domain.'" />';
+        $output .= &Apache::lonhtmlcommon::row_closure(1)."\n".
+                   &Apache::lonhtmlcommon::row_title(&mt('Domain'),
+                                                     'LC_pick_box_title')."\n".
+                   $udomform."\n";
+    }
+
+    $output .= &Apache::lonhtmlcommon::row_closure(0).
+               &Apache::lonhtmlcommon::row_title().
                '<input type="button" name="username_validation" value="'.
                $submit_text.'" onclick="javascript:send()" />'."\n".
                &Apache::lonhtmlcommon::row_closure(1)."\n".