diff --git a/mysql/edit_cnf.cgi b/mysql/edit_cnf.cgi
index bd5a88811..2ca4f952f 100755
--- a/mysql/edit_cnf.cgi
+++ b/mysql/edit_cnf.cgi
@@ -58,6 +58,10 @@ $ilt = &find_value("innodb_lock_wait_timeout", $mems);
 print &ui_table_row($text{'cnf_ilt'},
 		    &ui_opt_textbox("ilt", $ilt, 10, $text{'default'}));
 
+$sql_mode = &find_value("sql_mode", $mems);
+print &ui_table_row($text{'cnf_sqlm'},
+	&ui_opt_textbox("sqlm", $sql_mode, 60, $text{'default'}), 3);
+
 # Show set variables
 print &ui_table_hr();
 
diff --git a/mysql/lang/en b/mysql/lang/en
index a63ad96f1..3fbaaab33 100644
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -762,6 +762,8 @@ cnf_restart=Save and Restart MySQL
 cnf_fpt=Separate file for each InnoDB table?
 cnf_ilt=InnoDB lock timeout (in seconds)
 cnf_eilt=InnoDB lock timeout must be an integer
+cnf_sqlm=SQL mode options
+cnf_esqlm=SQL mode options must be a comma-separate list of flags
 
 manual_title=Edit Config Files
 manual_file=Edit config file:
diff --git a/mysql/save_cnf.cgi b/mysql/save_cnf.cgi
index 4d570eb94..4a2c6d730 100755
--- a/mysql/save_cnf.cgi
+++ b/mysql/save_cnf.cgi
@@ -68,6 +68,14 @@ else {
 			[ $in{'ilt'} ]);
 	}
 
+if ($in{'sqlm_def'}) {
+	&save_directive($conf, $mysqld, "sql_mode", [ ]);
+	}
+else {
+	$in{'sqlm'} =~ /^\S+$/ || &error($text{'cnf_esqlm'});
+	&save_directive($conf, $mysqld, "sql_mode", [ $in{'sqlm'} ]);
+	}
+
 &save_directive($conf, $mysqld, "big-tables",
 		$in{'big-tables'} ? [ "" ] : [ ]);
 
diff --git a/servers/config.info b/servers/config.info
index c883cc3c8..1079edc7c 100644
--- a/servers/config.info
+++ b/servers/config.info
@@ -12,5 +12,4 @@ auto_type=Default system type,14,show_deftype
 skipips=IPs or hostnames of systems to not detect,9,50,5,\t
 skipifaces=Network interfaces to not detect,0
 max_servers=Show search form if number of servers exceeds,0
-line2=System configuration,11
 capath=Files and directories for remote SSL CA certificates,9,50,5,\t
diff --git a/servers/config.info.ar b/servers/config.info.ar
index 2a33044e7..74d723720 100644
--- a/servers/config.info.ar
+++ b/servers/config.info.ar
@@ -12,5 +12,4 @@ auto_type=نوع النظام الافتراضي,14,show_deftype
 skipips=لا تكشف IPs أو أسماء المضيفين من الأنظمة,9,50,5,\t
 skipifaces=لا تكشف واجهات الشبكة,0
 max_servers=إظهار نموذج البحث إذا تجاوز عدد الخوادم,0
-line2=تكوين النظام,11
 capath=ملف أو دليل لشهادات SSL CA عن بعد,0
diff --git a/servers/config.info.ca b/servers/config.info.ca
index 4e21cdd9b..e16af62dd 100644
--- a/servers/config.info.ca
+++ b/servers/config.info.ca
@@ -12,5 +12,4 @@ auto_type=Tipus de sistema per defecte,14,show_deftype
 skipips=IPs o noms de host dels sistemes que no s'an de detectar,9,50,5,\t
 skipifaces=Interfícies de xarxa que no s'han de detectar,0
 max_servers=Mostra el formulari de cerca si el nombre de servidors és excessiu,0
-line2=Configuració del sistema,11
 capath=Fitxer o directori dels certificats CS SSL remots,0
diff --git a/servers/config.info.cs b/servers/config.info.cs
index b81be6b46..b7d39715a 100644
--- a/servers/config.info.cs
+++ b/servers/config.info.cs
@@ -4,4 +4,3 @@ scan_time=Časová prodleva pro scanování reakcí,0
 display_mode=Ukázat servery jako,1,1-tabulku,0-ikony
 sort_mode=Seřadit servery podle,1,4-IP adres,1-jména host,2-popisu,3-OS,5-skupiny,0-pořadí vzniku
 show_status=Ukázat stav serverů?,1,1-ano,0-ne
-line2=SKonfigurace systému,11
diff --git a/servers/config.info.de b/servers/config.info.de
index d33a13b64..a5102b858 100644
--- a/servers/config.info.de
+++ b/servers/config.info.de
@@ -12,5 +12,4 @@ auto_type=Standard-System-Typ,14,show_deftype
 skipips=IPs oder Hostnamen des Systems nicht erkennen,9,50,5,\t
 skipifaces=Netzwerkschnittstelle nicht erkennen,0
 max_servers=Suchformular anzeigen, wenn Anzahl an Server überschritten wurde,0
-line2=Systemkonfiguration,11
 capath=Datei oder Verzeichnis für entfernte SSL-CA-Zertifikate,0
diff --git a/servers/config.info.es b/servers/config.info.es
index 9c621838e..fbeb2c7e0 100644
--- a/servers/config.info.es
+++ b/servers/config.info.es
@@ -4,4 +4,3 @@ scan_time=Tiempo a esperar para respuestas de exploración,0
 display_mode=Mostrar servidores como,1,1-Tabla,0-Iconos
 sort_mode=Clasificar servidores por,1,4-Dirección IP,1-Nombre de máquina,2-Descripción,3-SO,5-Grupo,0-Orden de creación
 show_status=Mostrar el estado de los servidores,1,1-Sí,0-No
-line2=Configuración de sistema,11
diff --git a/servers/config.info.fr b/servers/config.info.fr
index 653fa1a02..a5570244e 100644
--- a/servers/config.info.fr
+++ b/servers/config.info.fr
@@ -4,4 +4,3 @@ scan_time=Temps à attendre pendant la recherche des serveurs,0,5
 display_mode=Afficher les serveurs sous forme,1,1-De table,0-D'icônes
 sort_mode=Trier les serveurs par,1,4-Adresse IP,1-Nom d'hôte,2-Description,3-OS,5-Groupe,0-Ordre de création
 show_status=Afficher l'état des serveurs,1,1-Oui,0-Non
-line2=Configuration du système,11
diff --git a/servers/config.info.it b/servers/config.info.it
index 206456449..7445d871b 100644
--- a/servers/config.info.it
+++ b/servers/config.info.it
@@ -11,4 +11,3 @@ deffast=Modalità RPC predefinita,1,1-Veloce,2-Automatica,0-Lenta
 auto_type=Tipo di sistema predefinito,14,show_deftype
 skipips=Indirizzi IP o nomi host del sistema da non individuare,9,50,5,\t
 skipifaces=Interfacce di rete da non individuare,0
-line2=Configurazione di sistema,11
diff --git a/servers/config.info.ja b/servers/config.info.ja
index 5a0f01736..1ffe9b081 100644
--- a/servers/config.info.ja
+++ b/servers/config.info.ja
@@ -12,5 +12,4 @@ auto_type=デフォルトの OS 指定,14,show_deftype
 skipips=検索から除外する IP アドレス、ホスト名,9,50,5,\t
 skipifaces=検索から除外するネットワークインターフェース,0
 max_servers=検索結果の上限,0
-line2=システム設定,11
 capath=リモート SSL 証明書のファイルまたはディレクトリ,0
diff --git a/servers/config.info.ko b/servers/config.info.ko
index 4cb205d18..014804b79 100644
--- a/servers/config.info.ko
+++ b/servers/config.info.ko
@@ -11,4 +11,3 @@ deffast=기본 RPC 모드,1,1-Fast,2-자동,3-Slow
 auto_type=기본 시스템 형식,14,show_deftype
 skipips=탐지하지 않을 시스템의 IP 또는 호스트이름,9,50,5,\t
 skipifaces=감지하지 않을 네트워크 인터페이스,0
-line2=시스템 설정,11
diff --git a/servers/config.info.ms b/servers/config.info.ms
index 322992eaa..94c2131ee 100644
--- a/servers/config.info.ms
+++ b/servers/config.info.ms
@@ -11,4 +11,3 @@ deffast=Mod lalai RPC,1,1-Pantas,2-Automatik,0-Perlahan
 auto_type=Jenis sistem lalai,14,show_deftype
 skipips=IP atau nama hos sistem tidak dapat dikesan,9,50,5,\t
 skipifaces=Antara muka rangkaian tidak dapat dikesan,0
-line2=Konfigurasi sistem,11
diff --git a/servers/config.info.nl b/servers/config.info.nl
index 4f4928cc4..c1cc77d19 100644
--- a/servers/config.info.nl
+++ b/servers/config.info.nl
@@ -11,4 +11,3 @@ deffast=Standaard RPC mode,1,1-Snel,2-Automatisch,0-Langzaam
 auto_type=Standaard systeem type,14,show_deftype
 skipips=IP of hostnamen van systemen om niet te detecteren,9,50,5,\t
 skipifaces=Netwerk interfaces om niet te detecteren,0
-line2=Systeem configuratie,11
diff --git a/servers/config.info.no b/servers/config.info.no
index dbe156548..f18b8a3bd 100644
--- a/servers/config.info.no
+++ b/servers/config.info.no
@@ -11,4 +11,3 @@ deffast=Standard RPC modus,1,1-Hurtig,2-Automatisk,0-Langsom
 auto_type=Standard systemtype,14,show_deftype
 skipips=IPer eller vertsnavn på system som ikke skal oppdages,9,50,5,\t
 skipifaces=Nettverksgrensesnitt som ikke skal oppdages,0
-line2=System konfigurasjon,11
diff --git a/servers/config.info.pl b/servers/config.info.pl
index 427f98c81..a0d5ff669 100644
--- a/servers/config.info.pl
+++ b/servers/config.info.pl
@@ -12,4 +12,3 @@ auto_type=Domyślny typ systemu,14,show_deftype
 skipips=Adresy IP lub nazwy hostów systemu nie zostały wykryte,9,50,5,\t
 skipifaces=Interfejs sieci nie został wykryty,0
 max_servers=Pokaż formularz wyszukiwania, jeśli liczba serwerów przekracza,0
-line2=Ustawienia systemowe,11
diff --git a/servers/config.info.pt_BR b/servers/config.info.pt_BR
index f0947a280..46e085cb6 100644
--- a/servers/config.info.pt_BR
+++ b/servers/config.info.pt_BR
@@ -4,4 +4,3 @@ scan_time=Tempo a aguardar por respostas de procuras,0
 display_mode=Exibir servidor como,1,1-Tabela,0-Ícones
 sort_mode=Ordenar servidor por,1,4-Endereço IP,1-Hostname,2-Descrição,3-OS,5-Grupo,0-Ordem de criação
 show_status=Exibir status para servidores,1,1-Sim,0-Não
-line2=Configuração do sistema,11
diff --git a/servers/config.info.ru b/servers/config.info.ru
index a8d752e68..d9c8a68a3 100644
--- a/servers/config.info.ru
+++ b/servers/config.info.ru
@@ -11,4 +11,3 @@ deffast=Тип RPC по-умолчанию,1,1-Fast,2-Automatic,0-Slow
 auto_type=Тип системы по-умолчанию,14,show_deftype
 skipips=Исключить из поиска IP-адреса или имена-хостов,9,50,5,\t
 skipifaces=Исключить из поиска сетевые интерфейсы,0
-line2=Конфигурация системы,11
diff --git a/servers/config.info.sk b/servers/config.info.sk
index dc8cd4078..424d2d4c1 100644
--- a/servers/config.info.sk
+++ b/servers/config.info.sk
@@ -4,4 +4,3 @@ scan_time=Čas pre čakanie na odpoveď pri skenovaní,0,5
 display_mode=Zobraziť servre ako,1,1-Tabuľku,0-Ikonky
 sort_mode=Triediť servre podľa,1,4-IP adresy,1-mena,2-popisu,3-OS,5-skupiny,0-poradia vytvorenia
 show_status=Zobrazovať stav serverov,1,1-Áno,0-Nie
-line2=Systémová konfigurácia,11
diff --git a/servers/config.info.tr b/servers/config.info.tr
index 1537878fe..7387d631c 100644
--- a/servers/config.info.tr
+++ b/servers/config.info.tr
@@ -4,4 +4,3 @@ scan_time=Yanıtları taramak için bekleme süresi,0,5
 display_mode=Sunucuları şu şekilde göster,1,1-Tablo,0-Simgeler
 sort_mode=Sunucuları sıralama biçimi,1,4-IP Adresi,1-Makine adı,2-Açıklama,3-OS,5-Grup,0-Oluşturulduğu sıra ile
 show_status=Sunucular için durum gösterilsin,1,1-Evet,0-Hayır
-line2=Sistem yapılandırması,11