2 files changed, 32 insertions, 14 deletions
diff --git a/views/default/forms/user/passwordreset.php b/views/default/forms/user/passwordreset.php
new file mode 100644
index 000000000..5946fa7c0
--- /dev/null
+++ b/views/default/forms/user/passwordreset.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Reset user password form
+ */
+
+echo elgg_autop(elgg_echo('user:resetpassword:reset_password_confirm'));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'u',
+	'value' => $vars['guid'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'c',
+	'value' => $vars['code'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('resetpassword')
+));
diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index a235f2cc6..c90971eaf 100644
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -7,20 +7,18 @@
  */
 ?>
 
-<p class="mtm">
+<div class="mtm">
 	<?php echo elgg_echo('user:password:text'); ?>
-</p>
-<p>
-	<label><?php echo elgg_echo('username'); ?></label>
-	<?php echo elgg_view('input/text', array('internalname' => 'username')); ?>
-</p>
+</div>
+<div>
+	<label><?php echo elgg_echo('loginusername'); ?></label><br />
+	<?php echo elgg_view('input/text', array(
+		'name' => 'username',
+		'class' => 'elgg-autofocus',
+		));
+	?>
+</div>
 <?php echo elgg_view('input/captcha'); ?>
-<p>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('request'))); ?>
-</p>
-
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('input[name=username]').focus();
-	});
-</script>
-\ No newline at end of file
+</div>