diff --git a/pheditor.php b/pheditor.php
index b4c7092..de81ed3 100755
--- a/pheditor.php
+++ b/pheditor.php
@@ -140,12 +140,15 @@
 session_name('pheditor');
 session_start();
 
-if (empty(PASSWORD) === false && (isset($_SESSION['pheditor_admin']) === false || $_SESSION['pheditor_admin'] !== true)) {
+if (empty(PASSWORD) === false && (isset($_SESSION['pheditor_admin'], $_SESSION['pheditor_password']) === false || $_SESSION['pheditor_admin'] !== true || $_SESSION['pheditor_password'] != PASSWORD)) {
 	if (isset($_POST['pheditor_password']) && empty($_POST['pheditor_password']) === false) {
-		if (hash('sha512', $_POST['pheditor_password']) === PASSWORD) {
+		$password_hash = hash('sha512', $_POST['pheditor_password']);
+
+		if ($password_hash === PASSWORD) {
 			session_regenerate_id(true);
 
 			$_SESSION['pheditor_admin'] = true;
+			$_SESSION['pheditor_password'] = $password_hash;
 
 			redirect();
 		} else {
@@ -360,10 +363,11 @@
 
 			if (isset($_POST['password']) && empty($_POST['password']) === false) {
 				$contents = file(__FILE__);
+				$password_hash = hash('sha512', $_POST['password']);
 
 				foreach ($contents as $key => $line) {
 					if (strpos($line, 'define(\'PASSWORD\'') !== false) {
-						$contents[$key] = "define('PASSWORD', '" . hash('sha512', $_POST['password']) . "');\n";
+						$contents[$key] = "define('PASSWORD', '" . $password_hash . "');\n";
 
 						break;
 					}
@@ -375,6 +379,10 @@
 
 				file_put_contents(__FILE__, implode($contents));
 
+				$_SESSION['pheditor_password'] = $password_hash;
+
+				session_regenerate_id(true);
+
 				echo json_success('Password changed successfully');
 			}
 			break;