diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index b57372089..c8fcfa8fd 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -31,9 +31,10 @@ require_once("../inc/inc.Notification.php");
 
 use Seeddms\Seeddms\Session;
 use Seeddms\Seeddms\Utilities;
+use Seeddms\Seeddms\PasswordStrength;
 
-require_once("../inc/inc.ClassSession.php");
-require_once("../inc/inc.ClassPasswordStrength.php");
+//require_once("../inc/inc.ClassSession.php");
+//require_once("../inc/inc.ClassPasswordStrength.php");
 require_once("../inc/inc.ClassPasswordHistoryManager.php");
 
 /* Load session */
@@ -80,7 +81,7 @@ header("Cache-Control: no-cache,no-store");
 $command = isset($_REQUEST["command"]) ? $_REQUEST["command"] : '';
 switch($command) {
 	case 'checkpwstrength': /* {{{ */
-		$ps = new Password_Strength();
+		$ps = new PasswordStrength();
 		$ps->set_password($_REQUEST["pwd"]);
 		if($settings->_passwordStrengthAlgorithm == 'simple')
 			$ps->simple_calculate();
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index df8decc51..2710b7164 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -30,6 +30,8 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 //include("../inc/inc.ClassPasswordStrength.php");
 
+use Seeddms\Seeddms\PasswordStrength;
+
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -77,7 +79,7 @@ if ($action == "adduser") {
 
 	if (isset($pwd) && ($pwd != "")) {
 		if($settings->_passwordStrength && (!$user->isAdmin() || !$settings->_allowUnsecurePassword)) {
-			$ps = new Password_Strength();
+			$ps = new PasswordStrength();
 			$ps->set_password($pwd);
 			if($settings->_passwordStrengthAlgorithm == 'simple')
 				$ps->simple_calculate();
@@ -381,7 +383,7 @@ else if ($action == "edituser") {
 	
 	if (isset($pwd) && ($pwd != "")) {
 		if($settings->_passwordStrength && (!$user->isAdmin() || !$settings->_allowUnsecurePassword)) {
-			$ps = new Password_Strength();
+			$ps = new PasswordStrength();
 			$ps->set_password($pwd);
 			if($settings->_passwordStrengthAlgorithm == 'simple')
 				$ps->simple_calculate();