diff --git a/web/admin/changepass.php b/web/admin/changepass.php
index f2da4f1..7d9810b 100644
--- a/web/admin/changepass.php
+++ b/web/admin/changepass.php
@@ -59,15 +59,20 @@ if (isset($OJ_LANG)) {
 							value="<?php echo htmlentities($_POST['user_id'], ENT_QUOTES, 'UTF-8'); ?>" type="text" required>
 					</div>
 			<?php } else { ?>
-					<div class="col-sm-3"><input name="user_id" class="form-control" placeholder="<?php echo $MSG_USER_ID . "*" ?>"
-							type="text" required></div>
+					<div class="col-sm-3"><input name="user_id" class="form-control"
+							placeholder="<?php echo $MSG_USER_ID . "*" ?>" type="text" required></div>
 			<?php } ?>
 		</div>
 
 		<div class="form-group">
 			<label class="col-sm-offset-3 col-sm-3 control-label"><?php echo $MSG_NICK ?></label>
 			<div class="col-sm-3"><input name="nick" class="form-control" placeholder="<?php echo $MSG_NICK ?>"
-					type="text" autocomplete="off" value="<?php echo $_POST['nick'] ?>"></div>
+					type="text" autocomplete="off" value="<?php
+					if (isset($_GET["nick"]))
+						echo $_GET['nick'];
+					else if (isset($_POST['nick']))
+						echo $_POST['nick'];
+					?>"></div>
 		</div>
 
 		<div class="form-group">