diff --git a/CHANGELOG b/CHANGELOG
index 832973f..7194029 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 Add option to make your own font small
+Separate changing nickname and password
 
 Version 1.22.1 - Nov. 13, 2016
 Performance optimizations
diff --git a/chat.php b/chat.php
index a20d666..3b59997 100644
--- a/chat.php
+++ b/chat.php
@@ -1962,7 +1962,10 @@ function send_profile($arg=''){
 		echo "<tr><td>&nbsp;</td><td>$I[oldpass]</td><td><input type=\"password\" name=\"oldpass\" size=\"20\"></td></tr>";
 		echo "<tr><td>&nbsp;</td><td>$I[newpass]</td><td><input type=\"password\" name=\"newpass\" size=\"20\"></td></tr>";
 		echo "<tr><td>&nbsp;</td><td>$I[confirmpass]</td><td><input type=\"password\" name=\"confirmpass\" size=\"20\"></td></tr>";
-		echo "<tr><td>&nbsp;</td><td>$I[newnickname]</td><td><input type=\"text\" name=\"newnickname\" size=\"20\" placeholder=\"$I[optional]\"></td></tr>";
+		echo '</table></td></tr></table></td></tr>';
+		thr();
+		echo "<tr><td><table id=\"changenick\"><tr><th>$I[changenick]</th><td><table>";
+		echo "<tr><td>&nbsp;</td><td>$I[newnickname]</td><td><input type=\"text\" name=\"newnickname\" size=\"20\">";
 		echo '</table></td></tr></table></td></tr>';
 		thr();
 	}
@@ -2793,11 +2796,11 @@ function save_profile(){
 		$stmt->execute([$U['passhash'], $U['session']]);
 		$stmt=$db->prepare('UPDATE ' . PREFIX . 'members SET passhash=? WHERE nickname=?;');
 		$stmt->execute([$U['passhash'], $U['nickname']]);
-		if(!empty($_REQUEST['newnickname'])){
-			$msg=set_new_nickname();
-			if($msg!==''){
-				return $msg;
-			}
+	}
+	if($U['status']>1 && !empty($_REQUEST['newnickname'])){
+		$msg=set_new_nickname();
+		if($msg!==''){
+			return $msg;
 		}
 	}
 	return $I['succprofile'];
@@ -2809,16 +2812,15 @@ function set_new_nickname(){
 	if(!valid_nick($_REQUEST['newnickname'])){
 		return sprintf($I['invalnick'], get_setting('maxname'), get_setting('nickregex'));
 	}
-	$U['passhash']=password_hash($_REQUEST['newpass'], PASSWORD_DEFAULT);
 	$stmt=$db->prepare('SELECT id FROM ' . PREFIX . 'sessions WHERE nickname=? UNION SELECT id FROM ' . PREFIX . 'members WHERE nickname=?;');
 	$stmt->execute([$_REQUEST['newnickname'], $_REQUEST['newnickname']]);
 	if($stmt->fetch(PDO::FETCH_NUM)){
 		return $I['nicknametaken'];
 	}else{
-		$stmt=$db->prepare('UPDATE ' . PREFIX . 'members SET nickname=?, passhash=? WHERE nickname=?;');
-		$stmt->execute([$_REQUEST['newnickname'], $U['passhash'], $U['nickname']]);
-		$stmt=$db->prepare('UPDATE ' . PREFIX . 'sessions SET nickname=?, passhash=? WHERE nickname=?;');
-		$stmt->execute([$_REQUEST['newnickname'], $U['passhash'], $U['nickname']]);
+		$stmt=$db->prepare('UPDATE ' . PREFIX . 'members SET nickname=? WHERE nickname=?;');
+		$stmt->execute([$_REQUEST['newnickname'], $U['nickname']]);
+		$stmt=$db->prepare('UPDATE ' . PREFIX . 'sessions SET nickname=? WHERE nickname=?;');
+		$stmt->execute([$_REQUEST['newnickname'], $U['nickname']]);
 		$stmt=$db->prepare('UPDATE ' . PREFIX . 'messages SET poster=? WHERE poster=?;');
 		$stmt->execute([$_REQUEST['newnickname'], $U['nickname']]);
 		$stmt=$db->prepare('UPDATE ' . PREFIX . 'messages SET recipient=? WHERE recipient=?;');
@@ -3470,7 +3472,7 @@ function check_init(){
 }
 
 function destroy_chat($C){
-	global $I, $db, $language, $memcached;
+	global $I, $db, $memcached;
 	setcookie(COOKIENAME, false);
 	$_REQUEST['session']='';
 	print_start('destory');
@@ -3495,7 +3497,7 @@ function destroy_chat($C){
 		$memcached->delete(DBNAME . '-' . PREFIX . 'settings-msgencrypted');
 	}
 	echo "<h2>$I[destroyed]</h2><br><br><br>";
-	echo form('setup').hidden('lang', $language).submit($I['init']).'</form>'.credit();
+	echo form('setup').submit($I['init']).'</form>'.credit();
 	print_end();
 }
 
diff --git a/lang_de.php b/lang_de.php
index d813a5f..146cbc1 100644
--- a/lang_de.php
+++ b/lang_de.php
@@ -160,6 +160,7 @@ $T=[
 	'nbsize' => 'Notizboxgröße',
 	'width' => 'Breite:',
 	'height' => 'Höhe:',
+	'changenick' => 'Nickname ändern',
 	'changepass' => 'Passwort ändern',
 	'oldpass' => 'Altes Passwort:',
 	'newpass' => 'Neues Passwort:',
diff --git a/lang_en.php b/lang_en.php
index a952908..869e928 100644
--- a/lang_en.php
+++ b/lang_en.php
@@ -160,6 +160,7 @@ $I=[
 	'nbsize' => 'Notes box size',
 	'width' => 'Width:',
 	'height' => 'Height:',
+	'changenick' => 'Change Nickname',
 	'changepass' => 'Change Password',
 	'oldpass' => 'Old password:',
 	'newpass' => 'New password:',