1 files changed, 48 insertions, 16 deletions

diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index e2152e654..4f337e4e4 100644
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -7,40 +7,72 @@
  * 
  */
 
-$admin_option = false;
-if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
-	$admin_option = true;
+$name = $username = $email = $password = $password2 = $admin = '';
+
+if (elgg_is_sticky_form('useradd')) {
+	extract(elgg_get_sticky_values('useradd'));
+	elgg_clear_sticky_form('useradd');
+	if (is_array($admin)) {
+		$admin = $admin[0];
+	}
 }
+
 ?>
 <div>
 	<label><?php echo elgg_echo('name');?></label><br />
-	<?php echo elgg_view('input/text' , array('name' => 'name')); ?>
+	<?php
+	echo elgg_view('input/text', array(
+		'name' => 'name',
+		'value' => $name,
+	));
+	?>
 </div>
 <div>
 	<label><?php echo elgg_echo('username'); ?></label><br />
-	<?php echo elgg_view('input/text' , array('name' => 'username')); ?>
+	<?php
+	echo elgg_view('input/text', array(
+		'name' => 'username',
+		'value' => $username,
+	));
+	?>
 </div>
 <div>
 	<label><?php echo elgg_echo('email'); ?></label><br />
-	<?php echo elgg_view('input/text' , array('name' => 'email')); ?>
+	<?php
+	echo elgg_view('input/text', array(
+		'name' => 'email',
+		'value' => $email,
+	));
+	?>
 </div>
 <div>
 	<label><?php echo elgg_echo('password'); ?></label><br />
-	<?php echo elgg_view('input/password' , array('name' => 'password')); ?>
+	<?php
+	echo elgg_view('input/password', array(
+		'name' => 'password',
+		'value' => $password,
+	));
+	?>
 </div>
 <div>
 	<label><?php echo elgg_echo('passwordagain'); ?></label><br />
-	<?php echo elgg_view('input/password' , array('name' => 'password2')); ?>
+	<?php
+	echo elgg_view('input/password', array(
+		'name' => 'password2',
+		'value' => $password2,
+	));
+	?>
 </div>
-
+<div>
 <?php 
-if ($admin_option) {
-	echo "<div>";
-	echo elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option'))));
-	echo "</div>";
-}
+	echo elgg_view('input/checkboxes', array(
+		'name' => "admin",
+		'options' => array(elgg_echo('admin_option') => 1),
+		'value' => $admin,
+	));
 ?>
+</div>
 
-<div>
-	<?php echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register'))); ?>
+<div class="elgg-foot">
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('register'))); ?>
 </div>
\ No newline at end of file