diff --git a/src/gui/qgsgui.cpp b/src/gui/qgsgui.cpp
index f3eb10c23d12..ffa987000198 100644
--- a/src/gui/qgsgui.cpp
+++ b/src/gui/qgsgui.cpp
@@ -332,7 +332,7 @@ bool QgsGui::pythonMacroAllowed( void ( *lambda )(), QgsMessageBar *messageBar )
       {
         QMessageBox msgBox( QMessageBox::Information, tr( "Python Macros" ),
                             tr( "Python macros are currently disabled. Do you allow this macro to run?" ) );
-        QAbstractButton *stopSessionButton = msgBox.addButton( tr( "Don't Ask Anymore" ), QMessageBox::DestructiveRole );
+        QAbstractButton *stopSessionButton = msgBox.addButton( tr( "Disable for this Session" ), QMessageBox::DestructiveRole );
         msgBox.addButton( tr( "No" ), QMessageBox::NoRole );
         QAbstractButton *yesButton = msgBox.addButton( tr( "Yes" ), QMessageBox::YesRole );
         msgBox.exec();
diff --git a/src/gui/vector/qgsattributesforminitcode.cpp b/src/gui/vector/qgsattributesforminitcode.cpp
index 8ab9fd4693b5..0a1ee8791999 100644
--- a/src/gui/vector/qgsattributesforminitcode.cpp
+++ b/src/gui/vector/qgsattributesforminitcode.cpp
@@ -16,12 +16,14 @@
 #include "qgsattributesforminitcode.h"
 #include "ui_qgsattributesforminitcode.h"
 #include "qgssettings.h"
+#include "qgsgui.h"
 
 #include <QFileDialog>
 
 QgsAttributesFormInitCode::QgsAttributesFormInitCode()
 {
   setupUi( this );
+  QgsGui::enableAutoGeometryRestore( this );
 
   // Init function stuff
   mInitCodeSourceComboBox->addItem( QString() );