diff --git a/web/changepass.php b/web/changepass.php
index 378bc13..3df9af9 100644
--- a/web/changepass.php
+++ b/web/changepass.php
@@ -27,7 +27,7 @@ if (isset($OJ_LANG)) {
 		$passwd = $_POST['passwd'];
 		$nick = $_POST['nick'];
 
-		if ($nick != "") {
+		if (isset($nick) && $nick != "") {
 			$sql = "update `users` set `nick`=? where `user_id`=?  and user_id not in( select user_id from privilege where rightstr='administrator')";
 			pdo_query($sql, $nick, $user_id);
 
@@ -36,7 +36,7 @@ if (isset($OJ_LANG)) {
 
 		}
 
-		if ($passwd != "") {
+		if (isset($passwd) && $passwd != "") {
 			$passwd = pwGen($passwd);
 			$sql = "update `users` set `password`=? where `user_id`=?  and user_id not in( select user_id from privilege where rightstr='administrator')";
 
@@ -59,8 +59,8 @@ 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>