diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 02dbee42..0a30c070 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -115,7 +115,7 @@ class RegisterController extends Controller
             'name'     => 'nullable|string|max:'.config('pixelfed.max_name_length'),
             'username' => $usernameRules,
             'email'    => $emailRules,
-            'password' => 'required|string|min:12|confirmed',
+            'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
         ];
 
         return Validator::make($data, $rules);
diff --git a/config/pixelfed.php b/config/pixelfed.php
index 7504c949..cf2935b3 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -119,6 +119,16 @@ return [
     */
     'max_name_length' => env('MAX_NAME_LENGTH', 30),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Password minimum length limit
+    |--------------------------------------------------------------------------
+    |
+    | Change the minimum length limit for user passwords.
+    |
+    */
+    'min_password_length' => env('MIN_PASSWORD_LENGTH', 12),
+
     /*
     |--------------------------------------------------------------------------
     | Album size limit