diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2932c3d6d..223eb8f31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.7.39.4
+## 02/22/2023
+
+1. [](#bugfix)
+    * Reverted a reorganization of `account.yaml` that caused username to be disabled [admin#2344](https://github.com/getgrav/grav-plugin-admin/issues/2344)
+
 # v1.7.39.3
 ## 02/21/2023
 
diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index ccc09a9f8..ef5f25b04 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -30,63 +30,62 @@ form:
             type: section
             title: PLUGIN_ADMIN.ACCOUNT
             underline: true
-            fields:
 
-                username:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.USERNAME
-                    disabled: true
-                    readonly: true
+        username:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.USERNAME
+            disabled: true
+            readonly: true
 
-                email:
-                    type: email
-                    size: large
-                    label: PLUGIN_ADMIN.EMAIL
-                    validate:
-                      type: email
-                      message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                      required: true
+        email:
+            type: email
+            size: large
+            label: PLUGIN_ADMIN.EMAIL
+            validate:
+              type: email
+              message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+              required: true
 
-                password:
-                    type: password
-                    size: large
-                    label: PLUGIN_ADMIN.PASSWORD
-                    autocomplete: new-password
-                    validate:
-                      required: false
-                      message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                      config-pattern@: system.pwd_regex
+        password:
+            type: password
+            size: large
+            label: PLUGIN_ADMIN.PASSWORD
+            autocomplete: new-password
+            validate:
+              required: false
+              message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+              config-pattern@: system.pwd_regex
 
-                fullname:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.FULL_NAME
-                    validate:
-                      required: true
+        fullname:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.FULL_NAME
+            validate:
+              required: true
 
-                title:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.TITLE
+        title:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.TITLE
 
-                language:
-                    type: select
-                    label: PLUGIN_ADMIN.LANGUAGE
-                    size: medium
-                    classes: fancy
-                    data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
-                    default: 'en'
-                    help: PLUGIN_ADMIN.LANGUAGE_HELP
+        language:
+            type: select
+            label: PLUGIN_ADMIN.LANGUAGE
+            size: medium
+            classes: fancy
+            data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
+            default: 'en'
+            help: PLUGIN_ADMIN.LANGUAGE_HELP
 
-                content_editor:
-                    type: select
-                    label: PLUGIN_ADMIN.CONTENT_EDITOR
-                    size: medium
-                    classes: fancy
-                    data-options@: 'Grav\Plugin\Admin\Admin::contentEditor'
-                    default: 'default'
-                    help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP
+        content_editor:
+            type: select
+            label: PLUGIN_ADMIN.CONTENT_EDITOR
+            size: medium
+            classes: fancy
+            data-options@: 'Grav\Plugin\Admin\Admin::contentEditor'
+            default: 'default'
+            help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP
 
         twofa_check:
             type: conditional
diff --git a/system/defines.php b/system/defines.php
index b343f0526..285631092 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -9,7 +9,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.7.39.3');
+define('GRAV_VERSION', '1.7.39.4');
 define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
 define('GRAV_TESTING', false);