diff --git a/assets/plugins/codemirror/codemirror.plugin.php b/assets/plugins/codemirror/codemirror.plugin.php
index a8d7ad7b87..bbe392425a 100755
--- a/assets/plugins/codemirror/codemirror.plugin.php
+++ b/assets/plugins/codemirror/codemirror.plugin.php
@@ -176,8 +176,8 @@
     <script type="text/javascript">
         window.evoElementNameHelperConfig = window.evoElementNameHelperConfig || {};
         window.evoElementNameHelperConfig.endpoint = "{$elementNameHelperEndpoint}";
-        // Add mode MODX for syntax highlighting. Dfsed on $mode
-        CodeMirror.defineMode("MODx-{$mode}", function(config, parserConfig) {
+        // Add the Evolution CMS overlay mode for syntax highlighting, on top of $mode
+        CodeMirror.defineMode("Evo-{$mode}", function(config, parserConfig) {
             var mustacheOverlay = {
                 token: function(stream, state) {
                     var ch;
@@ -264,6 +264,12 @@
             };
             return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "{$mode}"), mustacheOverlay);
         });
+        // The mode was called MODx-* for as long as this plugin has existed,
+        // and third-party code refers to it by that name. Kept as an alias so
+        // the rename cannot break it.
+        CodeMirror.defineMode("MODx-{$mode}", function(config) {
+            return CodeMirror.getMode(config, "Evo-{$mode}");
+        });
         function makeMarker(symbol) {
           var marker = document.createElement("div");
           marker.style.color = "#822";
@@ -273,7 +279,7 @@ function makeMarker(symbol) {
         }
         //Basic settings
         var config = {
-            mode: 'MODx-{$mode}',
+            mode: 'Evo-{$mode}',
             theme: '{$theme}',
             defaulttheme: '{$defaulttheme}',
             darktheme: '{$darktheme}',
diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php
index d26b88672d..e5484584e6 100755
--- a/manager/actions/mutate_web_user.dynamic.php
+++ b/manager/actions/mutate_web_user.dynamic.php
@@ -76,10 +76,10 @@
 if($modx->getManagerApi()->action == '88') {
 	// get user attributes
 	$userdatatmp = \EvolutionCMS\Models\UserAttribute::query()->where('internalKey', $user)->first();
-    $userdatatmp = $userdatatmp->makeVisible('role')->toArray();
 	if(!$userdatatmp) {
 		$modx->webAlertAndQuit("No user returned!");
 	}
+    $userdatatmp = $userdatatmp->makeVisible('role')->toArray();
 	$userdata = array_merge($userdata, $userdatatmp);
 	unset($userdatatmp);
 
@@ -87,10 +87,11 @@
     $usersettings = \EvolutionCMS\Models\UserSetting::where('user', $user)->pluck('setting_value', 'setting_name')->toArray();
 	extract($usersettings, EXTR_OVERWRITE);
 	// get user name
-	$usernamedata = \EvolutionCMS\Models\User::find($user)->toArray();
+	$usernamedata = \EvolutionCMS\Models\User::find($user);
 	if(!$usernamedata) {
 		$modx->webAlertAndQuit("No user returned while getting username!");
 	}
+	$usernamedata = $usernamedata->toArray();
 	$_SESSION['itemname'] = $usernamedata['username'];
 } else {
 	$_SESSION['itemname'] = $_lang["new_web_user"];
diff --git a/manager/views/page/template.blade.php b/manager/views/page/template.blade.php
index 1433cb690c..e9d3519861 100644
--- a/manager/views/page/template.blade.php
+++ b/manager/views/page/template.blade.php
@@ -186,6 +186,17 @@
                         'css': 'text/css'
                     };
 
+                    // The CodeMirror plugin registers its EVO tag overlay as
+                    // Evo-<mode>. Setting the bare name here would throw that
+                    // overlay away and leave the template editor with no tag
+                    // highlighting at all, so the overlay is preferred wherever
+                    // the plugin defined one for the mode being asked for.
+                    var overlaid = function(mode) {
+                        return window.CodeMirror && CodeMirror.modes['Evo-' + mode]
+                            ? 'Evo-' + mode
+                            : mode;
+                    };
+
                     var applyHighlighting = function() {
                         if (!window.myCodeMirrors || !window.myCodeMirrors['post']) {
                             return;
@@ -197,7 +208,7 @@
                                 : 'htmlmixed';
 
                         try {
-                            window.myCodeMirrors['post'].setOption('mode', mode);
+                            window.myCodeMirrors['post'].setOption('mode', overlaid(mode));
                         } catch (e) {
                             // An editor that will not take a mode is not worth
                             // breaking the form over.