diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9cff3bf88..eeb79db44c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.31.1] - 2022-02-21
+### Fixed 
+- Fix ClassNotFoundException on startup ([#1958](https://github.com/scm-manager/scm-manager/issues/1958))
+
 ## [2.31.0] - 2022-02-18
 ### Added
 - Add secondary color gradations to styleguide ([#1944](https://github.com/scm-manager/scm-manager/pull/1944))
diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/RandomPasswordGenerator.java b/scm-webapp/src/main/java/sonia/scm/lifecycle/RandomPasswordGenerator.java
index 33e3d0a7bb..c14654bc05 100644
--- a/scm-webapp/src/main/java/sonia/scm/lifecycle/RandomPasswordGenerator.java
+++ b/scm-webapp/src/main/java/sonia/scm/lifecycle/RandomPasswordGenerator.java
@@ -24,7 +24,7 @@
 
 package sonia.scm.lifecycle;
 
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang.RandomStringUtils;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;