diff --git a/common/framework/password.php b/common/framework/password.php
index a6831090b..57d622db6 100644
--- a/common/framework/password.php
+++ b/common/framework/password.php
@@ -141,12 +141,12 @@ class Password
 			$work_factor = $config->password_hashing_work_factor;
 			if (!$work_factor || $work_factor < 4 || $work_factor > 31)
 			{
-				$work_factor = 9;
+				$work_factor = 10;
 			}
 		}
 		else
 		{
-			$work_factor = 9;
+			$work_factor = 10;
 		}
 		
 		return $work_factor;
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 31ae1df4e..2365f261c 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -77,7 +77,7 @@ class member extends ModuleObject {
 		}
 		if(!$config->password_hashing_work_factor)
 		{
-			$config->password_hashing_work_factor = 8;
+			$config->password_hashing_work_factor = 10;
 		}
 		if(!$config->password_hashing_auto_upgrade)
 		{