-<p><?php printf(__('WordPress has been installed. Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $password); ?></p>
-<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.'); ?></p>
+<p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p>
+
+<table class="form-table">
+ <tr>
+ <th><?php _e('Username'); ?></th>
+ <td><code>admin</code></td>
+ </tr>
+ <tr>
+ <th><?php _e('Password'); ?></th>
+ <td><code><?php echo $password; ?></code><br />
+ <?php echo '<p>'.__('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.').'</p>'; ?></td>
+ </tr>
+</table>