diff --git a/C4/Category.pm b/C4/Category.pm
index fcb3ed8168..255db2b024 100644
--- a/C4/Category.pm
+++ b/C4/Category.pm
@@ -79,7 +79,7 @@ sub all {
     my $dbh = C4::Context->dbh;
     # The categories table is small enough for
     # `SELECT *` to be harmless.
-    my $query = "SELECT * FROM categories";
+    my $query = "SELECT categories.* FROM categories";
     $query .= qq{
         LEFT JOIN categories_branches ON categories_branches.categorycode = categories.categorycode
         WHERE categories_branches.branchcode = ? OR categories_branches.branchcode IS NULL
diff --git a/C4/Members.pm b/C4/Members.pm
index f381a41745..f85804f5b2 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1475,7 +1475,7 @@ sub GetBorrowercategoryList {
         ? 0
         : C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
     my $dbh       = C4::Context->dbh;
-    my $query = "SELECT * FROM categories";
+    my $query = "SELECT categories.* FROM categories";
     $query .= qq{
         LEFT JOIN categories_branches ON categories.categorycode = categories_branches.categorycode
         WHERE branchcode = ? OR branchcode IS NULL GROUP BY description