-<?php if (isset($Login2) && !$Login2->canLogin()): ?>
-<h3>You are registering as: <?=$Username?></h3>
-<p><?=$SSLName?></p>
-<p><?=$SSLEmail?></p>
-<?php endif; ?>
-
-<?php if (isset($Login2) && $Login2->canSignup()): ?>
-
-<form method=post>
-<p>password: <input type="password" name="p1"></p>
-<p>confirm: <input type="password" name="p2"></p>
-<input type=submit value="Confirm Registration">
+<?php if ($LoginSSL->canSignup()): ?>
+You are registering as: <?=$LoginSSL->getUsername()?><br /><br />
+<?=$LoginSSL->getName()?><br />
+<?=$LoginSSL->getEmail()?><br />
+<br />
+Please choose a MySQL password different<br />from your Athena account password.<br />
+<br />
+
+<table>
+<form method=post action="<?=$URI?>">
+<tr><td><label for="p1">password:</label></td><td><input type="password" name="p1"></td></tr>
+<tr><td><label for="p2">repeat password:</label></td><td><input type="password" name="p2"></td></tr>
+<tr><td colspan=2><input type=submit value="Confirm Registration"></td></tr>