diff --git a/alethzero/Main.ui b/alethzero/Main.ui
index 0a727e505..f5b52c309 100644
--- a/alethzero/Main.ui
+++ b/alethzero/Main.ui
@@ -185,7 +185,7 @@
     <addaction name="killBlockchain"/>
     <addaction name="inject"/>
     <addaction name="forceMining"/>
-    <addaction name="optimizeCompiler"/>
+    <addaction name="enableOptimizer"/>
    </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Network"/>
@@ -1668,12 +1668,12 @@ font-size: 14pt</string>
     <string>&amp;Refresh</string>
    </property>
   </action>
-  <action name="optimizeCompiler">
+  <action name="enableOptimizer">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Optimize LLL Compiler</string>
+    <string>&amp;Enable LLL &amp;Optimizer</string>
    </property>
   </action>
  </widget>
diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index dd12236e4..a4fc22a43 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -332,9 +332,9 @@ void Main::on_forceMining_triggered()
 	m_client->setForceMining(ui->forceMining->isChecked());
 }
 
-void Main::on_optimizeCompiler_triggered()
+void Main::on_enableOptimizer_triggered()
 {
-	m_optimizeCompiler = ui->optimizeCompiler->isChecked();
+	m_enableOptimizer = ui->enableOptimizer->isChecked();
 	on_data_textChanged();
 }
 
@@ -529,6 +529,7 @@ void Main::writeSettings()
 	s.setValue("paranoia", ui->paranoia->isChecked());
 	s.setValue("showAll", ui->showAll->isChecked());
 	s.setValue("showAllAccounts", ui->showAllAccounts->isChecked());
+	s.setValue("enableOptimizer", m_enableOptimizer);
 	s.setValue("clientName", ui->clientName->text());
 	s.setValue("idealPeers", ui->idealPeers->value());
 	s.setValue("port", ui->port->value());
@@ -576,7 +577,8 @@ void Main::readSettings(bool _skipGeometry)
 	ui->paranoia->setChecked(s.value("paranoia", false).toBool());
 	ui->showAll->setChecked(s.value("showAll", false).toBool());
 	ui->showAllAccounts->setChecked(s.value("showAllAccounts", false).toBool());
-	ui->optimizeCompiler->setChecked(m_optimizeCompiler);
+	m_enableOptimizer = s.value("enableOptimizer", true).toBool();
+	ui->enableOptimizer->setChecked(m_enableOptimizer);
 	ui->clientName->setText(s.value("clientName", "").toString());
 	ui->idealPeers->setValue(s.value("idealPeers", ui->idealPeers->value()).toInt());
 	ui->port->setValue(s.value("port", ui->port->value()).toInt());
@@ -1309,7 +1311,7 @@ void Main::on_data_textChanged()
 		}
 		else
 		{
-			m_data = eth::compileLLL(src, m_optimizeCompiler, &errors);
+			m_data = eth::compileLLL(src, m_enableOptimizer, &errors);
 			if (errors.size())
 			{
 				try
@@ -1327,7 +1329,7 @@ void Main::on_data_textChanged()
 			{
 				auto asmcode = eth::compileLLLToAsm(src, false);
 				lll = "<h4>Pre</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>";
-				if (m_optimizeCompiler)
+				if (m_enableOptimizer)
 				{
 					asmcode = eth::compileLLLToAsm(src, true);
 					lll = "<h4>Opt</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>" + lll;
diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h
index fc12a567e..46cb1843a 100644
--- a/alethzero/MainWin.h
+++ b/alethzero/MainWin.h
@@ -138,7 +138,7 @@ private slots:
 	void on_debugDumpState_triggered(int _add = 1);
 	void on_debugDumpStatePre_triggered();
 	void on_refresh_triggered();
-	void on_optimizeCompiler_triggered();
+	void on_enableOptimizer_triggered();
 
 signals:
 	void poll();
@@ -222,7 +222,7 @@ private:
 	QMap<unsigned, unsigned> m_pcWarp;
 	QList<WorldState> m_history;
 	std::map<eth::u256, eth::bytes> m_codes;	// and pcWarps
-	bool m_optimizeCompiler = true;
+	bool m_enableOptimizer = true;
 
 	QNetworkAccessManager m_webCtrl;