diff --git a/postfix/index.cgi b/postfix/index.cgi
index 28204d49f..aa6d68e1e 100755
--- a/postfix/index.cgi
+++ b/postfix/index.cgi
@@ -83,10 +83,13 @@ if (!-x $config{'postfix_super_command'}) {
 	exit;
 	}
 
-# Verify that current configuration is valid
+# Verify that current configuration is valid. If not, only allow manual editing
 if ($config{'index_check'} && ($err = &check_postfix())) {
 	print &text('check_error'),"<p>\n";
 	print "<pre>$err</pre>\n";
+	if ($access{'manual'}) {
+		print "<a href=edit_manual.cgi>$text{'check_manual'}</a><p>\n";
+		}
 	&ui_print_footer("/", $text{'index'});
 	exit;
 	}
diff --git a/postfix/lang/en b/postfix/lang/en
index 1c58ea3d4..8f1e0fb90 100644
--- a/postfix/lang/en
+++ b/postfix/lang/en
@@ -13,6 +13,7 @@ index_version=Postfix version $1
 opts_err=Failed to save options
 
 check_error=Error while checking current Postfix configuration. Please manually fix Postfix configuration.
+check_manual=Manually edit the Postfix configuration file.
 
 address_rewriting_title=Address Rewriting and Masquerading
 address_rewriting_ecannot=You are not allowed to edit address rewriting and masquerading