diff --git a/docs/upgrades/upgrade_7.7.18-7.7.19.pl b/docs/upgrades/upgrade_7.7.18-7.7.19.pl
index ec2731733..027a335c0 100644
--- a/docs/upgrades/upgrade_7.7.18-7.7.19.pl
+++ b/docs/upgrades/upgrade_7.7.18-7.7.19.pl
@@ -47,7 +47,7 @@ finish($session); # this line required
 sub addInboxSmsNotificationTemplateIdSetting {
     my $session = shift;
     print "\tAdding inboxSmsNotificationTemplateId setting... " unless $quiet;
-    if (!$session->db->quickScalar('select count(*) from settings where name = "inboxSmsNotificationTemplateId"')) {
+    if (!$session->setting->has("inboxSmsNotificationTemplateId")) {
         $session->setting->add('inboxSmsNotificationTemplateId', 'i9-G00ALhJOr0gMh-vHbKA');
     }
     print "DONE!\n" unless $quiet;
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 56b086cb9..6b0ca4064 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -579,10 +579,6 @@ sub getRichEditor {
         $out = q|<a style="display: block;" href="javascript:toggleEditor('|.$nameId.q|')">|.$i18n->get('Toggle editor').q|</a>|;
     }
     $out .= q|<script type="text/javascript">|;
-    while (my ($plugin, $path) = each %loadPlugins) {
-        $out .= "tinymce.PluginManager.load('$plugin', '$path');\n";
-    }
-    $out    .= "\ttinyMCE.init(" . JSON->new->pretty->encode(\%config) . " );\n";
     if ($ask) {
         $out .= <<"EOHTML1";
 function toggleEditor(id) {
@@ -596,6 +592,10 @@ function turnOffTinyMCE_$nameId () {
 }
 EOHTML1
     }
+    while (my ($plugin, $path) = each %loadPlugins) {
+        $out .= "tinymce.PluginManager.load('$plugin', '$path');\n";
+    }
+    $out    .= "\ttinyMCE.init(" . JSON->new->pretty->encode(\%config) . " );\n";
     $out    .= "</script>";
 }