diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a1a4def7..59bc75c91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to Gogs are documented in this file.
 ### Fixed
 
 - _Security:_ Potential SSRF in repository migration. [#6754](https://github.com/gogs/gogs/issues/6754)
+- _Security:_ Improper PAM authorization handling. [#6810](https://github.com/gogs/gogs/issues/6810)
 - Unable to use LDAP authentication on ARM machines. [#6761](https://github.com/gogs/gogs/issues/6761)
 
 ### Removed
diff --git a/internal/auth/pam/pam.go b/internal/auth/pam/pam.go
index 0777bf7c2..cbd3500d6 100644
--- a/internal/auth/pam/pam.go
+++ b/internal/auth/pam/pam.go
@@ -25,6 +25,10 @@ func (c *Config) doAuth(login, password string) error {
 	if err != nil {
 		return err
 	}
-
-	return t.Authenticate(0)
+	
+	err = t.Authenticate(0)
+	if err != nil {
+		return err
+	}
+	return t.AcctMgmt(0)
 }