diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl
index 716a9c8fc..6104af330 100755
--- a/mysql/mysql-lib.pl
+++ b/mysql/mysql-lib.pl
@@ -77,11 +77,16 @@ EOF
 }
 
 # Fix text if we're running MariaDB
+sub fix_mysql_text
+{
+my ($text) = @_;
 if ($mysql_version =~ /mariadb/i) {
-	foreach my $t (keys %text) {
-		$text{$t} =~ s/MySQL/MariaDB/g;
+	foreach my $t (keys %$text) {
+		$text->{$t} =~ s/MySQL/MariaDB/g;
 		}
 	}
+}
+&fix_mysql_text(\%text);
 
 if (&compare_version_numbers($mysql_version, "5.5") >= 0) {
 	@mysql_set_variables = ( "key_buffer_size", "sort_buffer_size",
diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index bc2450b4a..8fab057fa 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -5,6 +5,12 @@ use WebminCore;
 &init_config();
 %access = &get_module_acl();
 
+# Fix language strings that refer to MySQL
+if (&foreign_check("mysql")) {
+	&foreign_require("mysql");
+	&mysql::fix_mysql_text(\%text);
+	}
+
 # get_config_fmt(file)
 # Returns a format code for php.ini or FPM config files
 sub get_config_fmt