diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml
deleted file mode 100644
index 32848a0a5f..0000000000
--- a/.github/workflows/cla-check.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: CLA check
-
-on:
-  pull_request:
-    branches: [main, 16/edge]
-
-jobs:
-  cla-check:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Check if Canonical's Contributor License Agreement has been signed
-        uses: canonical/has-signed-canonical-cla@v2
diff --git a/lib/charms/postgresql_k8s/v0/postgresql.py b/lib/charms/postgresql_k8s/v0/postgresql.py
index 7ba643aadb..480dac02ba 100644
--- a/lib/charms/postgresql_k8s/v0/postgresql.py
+++ b/lib/charms/postgresql_k8s/v0/postgresql.py
@@ -35,7 +35,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 54
+LIBPATCH = 55
 
 # Groups to distinguish HBA access
 ACCESS_GROUP_IDENTITY = "identity_access"
@@ -267,7 +267,8 @@ def create_database(
             raise PostgreSQLCreateDatabaseError() from e
 
         # Enable preset extensions
-        self.enable_disable_extensions(dict.fromkeys(plugins, True), database)
+        if plugins:
+            self.enable_disable_extensions(dict.fromkeys(plugins, True), database)
 
     def create_user(
         self,
diff --git a/src/charm.py b/src/charm.py
index b73c096468..e89ae10aa8 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -2326,9 +2326,16 @@ def relations_user_databases_map(self) -> dict:
             })
             return user_database_map
         try:
-            for user in sorted(
-                self.postgresql.list_users_from_relation(current_host=self.is_connectivity_enabled)
-            ):
+            for user in self.postgresql.list_users(current_host=self.is_connectivity_enabled):
+                if user in (
+                    "backup",
+                    "monitoring",
+                    "operator",
+                    "postgres",
+                    "replication",
+                    "rewind",
+                ):
+                    continue
                 user_database_map[user] = ",".join(
                     self.postgresql.list_accessible_databases_for_user(
                         user, current_host=self.is_connectivity_enabled