diff --git a/docs/upgrades/upgrade_7.7.7-7.7.8.pl b/docs/upgrades/upgrade_7.7.7-7.7.8.pl
index eee646be0..e6b0f2195 100644
--- a/docs/upgrades/upgrade_7.7.7-7.7.8.pl
+++ b/docs/upgrades/upgrade_7.7.7-7.7.8.pl
@@ -88,6 +88,14 @@ sub addOgoneToConfig {
 }
 
 
+#----------------------------------------------------------------------------
+sub addSurveyExpressionEngineConfigFlag{
+    my $session = shift;
+    print "\tAdding enableSurveyExpressionEngine config option... " unless $quiet;
+    $session->config->set('enableSurveyExpressionEngine', 0);
+    print "Done.\n" unless $quiet;
+}
+
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
 #----------------------------------------------------------------------------
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index 042ff4a0d..d54a7d4b4 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -195,6 +195,11 @@
     "WebGUI::Asset::Template::HTMLTemplate"
     ],
 
+# Enable the Survey Expression Engine, which allows goto expressions in
+# the config.
+
+"enableSurveyExpressionEngine" : 0,
+
 # Specify the default template parser.
 
 "defaultTemplateParser" : "WebGUI::Asset::Template::HTMLTemplate",
diff --git a/t/Asset/Wobject/Survey/Test.t b/t/Asset/Wobject/Survey/Test.t
index 57a85db87..8752676ce 100644
--- a/t/Asset/Wobject/Survey/Test.t
+++ b/t/Asset/Wobject/Survey/Test.t
@@ -33,6 +33,9 @@ my $user = WebGUI::User->new( $session, 'new' );
 WebGUI::Test->usersToDelete($user);
 my $import_node = WebGUI::Asset->getImportNode($session);
 
+WebGUI::Test->originalConfig('enableSurveyExpressionEngine');
+$session->config->set('enableSurveyExpressionEngine', 1);
+
 # Create a Survey
 $s = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
 isa_ok( $s, 'WebGUI::Asset::Wobject::Survey' );