diff --git a/system/pages/account/change_password.php b/system/pages/account/change_password.php
index 98f7a48f..01190497 100644
--- a/system/pages/account/change_password.php
+++ b/system/pages/account/change_password.php
@@ -26,11 +26,11 @@ if(empty($new_password) && empty($new_password2) && empty($old_password)) {
 else
 {
 	if(empty($new_password) || empty($new_password2) || empty($old_password)){
-		$errors[] = "Please fill in form.";
+		$errors[] = 'Please fill in form.';
 	}
 	$password_strlen = strlen($new_password);
 	if($new_password != $new_password2) {
-		$errors[] = "The new passwords do not match!";
+		$errors[] = 'The new passwords do not match!';
 	}
 
 	if(empty($errors)) {
@@ -41,11 +41,12 @@ else
 		/** @var OTS_Account $account_logged */
 		$old_password = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $old_password);
 		if($old_password != $account_logged->getPassword()) {
-			$errors[] = "Current password is incorrect!";
+			$errors[] = 'Current password is incorrect!';
 		}
 
 		$hooks->trigger(HOOK_ACCOUNT_CHANGE_PASSWORD_POST);
 	}
+
 	if(!empty($errors)){
 		//show errors
 		$twig->display('error_box.html.twig', array('errors' => $errors));
@@ -53,12 +54,10 @@ else
 		//show form
 		$twig->display('account.change_password.html.twig');
 	}
-	else
-	{
+	else {
 		$org_pass = $new_password;
 
-		if(USE_ACCOUNT_SALT)
-		{
+		if(USE_ACCOUNT_SALT) {
 			$salt = generateRandomString(10, false, true, true);
 			$new_password = $salt . $new_password;
 			$account_logged->setCustomField('salt', $salt);
@@ -70,17 +69,18 @@ else
 		$account_logged->logAction('Account password changed.');
 
 		$message = '';
-		if($config['mail_enabled'] && $config['send_mail_when_change_password'])
-		{
+		if($config['mail_enabled'] && $config['send_mail_when_change_password']) {
 			$mailBody = $twig->render('mail.password_changed.html.twig', array(
 				'new_password' => $org_pass,
 				'ip' => get_browser_real_ip(),
 			));
 
-			if(_mail($account_logged->getEMail(), $config['lua']['serverName']." - Changed password", $mailBody))
-				$message = '<br/><small>Your new password were send on email address <b>'.$account_logged->getEMail().'</b>.</small>';
-			else
+			if(_mail($account_logged->getEMail(), $config['lua']['serverName']." - Changed password", $mailBody)) {
+				$message = '<br/><small>Your new password were send on email address <b>' . $account_logged->getEMail() . '</b>.</small>';
+			}
+			else {
 				$message = '<br/><p class="error">An error occurred while sending email. For Admin: More info can be found in system/logs/mailer-error.log</p>';
+			}
 		}
 
 		$twig->display('success.html.twig', array(