diff --git a/admin.yaml b/admin.yaml
index 19271276..42c2b00a 100644
--- a/admin.yaml
+++ b/admin.yaml
@@ -9,7 +9,7 @@ login:
   timeout: 1800
 warnings:
   delete_page: true
-edit_mode: auto       // auto|normal|expert
+edit_mode: normal
 show_beta_msg: true
 popularity:
   enabled: true
diff --git a/blueprints.yaml b/blueprints.yaml
index adaff161..8ee8bb97 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -51,9 +51,8 @@ form:
       type: select
       label: Edit mode
       size: small
-      default: auto
+      default: normal
       options:
-        auto: Auto
         normal: Normal
         expert: Expert
       help: Auto will use blueprint if available, if none found, it will use "Expert" mode.