diff --git a/phpini/edit_dirs.cgi b/phpini/edit_dirs.cgi
index 10d4ebd39..be15edc7d 100755
--- a/phpini/edit_dirs.cgi
+++ b/phpini/edit_dirs.cgi
@@ -21,18 +21,22 @@ print &ui_table_row(&opt_help($text{'dirs_include'}, 'include'),
 	&ui_textarea("include", join("\n", split(/:/, $include)), 3, 60)." ".
 	&file_chooser_button("include", 1, undef, undef, 1));
 
-# Extensions directory
-print &ui_table_row($text{'dirs_ext'},
-	&ui_opt_textbox("ext", &find_value("extension_dir", $conf),
-			60, $text{'default'})." ".
-	&file_chooser_button("ext", 1));
+$inidir = &get_php_ini_dir($in{'file'});
+if (!$inidir) {
+	# Extensions directory
+	print &ui_table_row($text{'dirs_ext'},
+		&ui_opt_textbox("ext", &find_value("extension_dir", $conf),
+				60, $text{'default'})." ".
+		&file_chooser_button("ext", 1));
 
-# Enabled extensions
-my @exts = map { [ $_->{'value'}, $_->{'value'} ] } &find("extension", $conf);
-my @avail = &list_available_extensions($conf, $in{'file'});
-if (@avail) {
-	print &ui_table_row($text{'dirs_exts'},
-		&ui_multi_select("exts", \@exts, \@avail, 10, 1));
+	# Enabled extensions
+	my @exts = map { [ $_->{'value'}, $_->{'value'} ] }
+		       &find("extension", $conf);
+	my @avail = &list_available_extensions($conf, $in{'file'});
+	if (@avail) {
+		print &ui_table_row($text{'dirs_exts'},
+			&ui_multi_select("exts", \@exts, \@avail, 10, 1));
+		}
 	}
 
 # Can accept uploads?
diff --git a/phpini/save_dirs.cgi b/phpini/save_dirs.cgi
index 2e42e138a..cc500948c 100755
--- a/phpini/save_dirs.cgi
+++ b/phpini/save_dirs.cgi
@@ -19,11 +19,16 @@ else {
 	&save_directive($conf, "include_path", join(":", @incs));
 	}
 
-$in{'ext_def'} || $in{'ext'} =~ /\S/ || &error($text{'dirs_eext'});
-&save_directive($conf, "extension_dir", $in{'ext_def'} ? undef : $in{'ext'});
+$inidir = &get_php_ini_dir($in{'file'});
+if (!$inidir) {
+	$in{'ext_def'} || $in{'ext'} =~ /\S/ || &error($text{'dirs_eext'});
+	&save_directive($conf, "extension_dir",
+			$in{'ext_def'} ? undef : $in{'ext'});
 
-if (defined($in{'exts'})) {
-	&save_directive($conf, "extension", [ split(/\r?\n/, $in{'exts'}) ]);
+	if (defined($in{'exts'})) {
+		&save_directive($conf, "extension",
+				[ split(/\r?\n/, $in{'exts'}) ]);
+		}
 	}
 
 &save_directive($conf, "file_uploads", $in{'file_uploads'} || undef);