diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
index 534edad24..99a7418f4 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
@@ -353,12 +353,18 @@ class Database {
     val allowConfigurableRecycleBin: Boolean
         get() = mDatabaseKDBX != null
 
-    var isRecycleBinEnabled: Boolean
+    val isRecycleBinEnabled: Boolean
         // Backup is always enabled in KDB database
         get() = mDatabaseKDB != null || mDatabaseKDBX?.isRecycleBinEnabled ?: false
-        set(value) {
-            mDatabaseKDBX?.isRecycleBinEnabled = value
+
+    fun enableRecycleBin(enable: Boolean, resources: Resources) {
+        mDatabaseKDBX?.isRecycleBinEnabled = enable
+        if (enable) {
+            ensureRecycleBinExists(resources)
+        } else {
+            removeRecycleBin()
         }
+    }
 
     val recycleBin: Group?
         get() {
@@ -379,11 +385,12 @@ class Database {
         get() = mDatabaseKDBX != null
 
     // Maybe another templates method with KDBX5
-    var isTemplatesEnabled: Boolean
+    val isTemplatesEnabled: Boolean
         get() = mDatabaseKDBX?.isTemplatesGroupEnabled() ?: false
-        set(value) {
-            mDatabaseKDBX?.enableTemplatesGroup(value)
-        }
+
+    fun enableTemplates(enable: Boolean) {
+        mDatabaseKDBX?.enableTemplatesGroup(enable)
+    }
 
     val templatesGroup: Group?
         get() {
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt
index 500ca897c..6c199a8ed 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt
@@ -341,8 +341,11 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     fun enableTemplatesGroup(enable: Boolean) {
         if (enable) {
-            // TODO Build default templates group
-            setTemplatesGroup(UUID_ZERO)
+            val uuidTemplatesGroup = mTemplateEngine.createNewTemplatesGroup()
+
+            addGroupTo(uuidTemplatesGroup, rootGroup)
+            entryTemplatesGroup = uuidTemplatesGroup.id
+            entryTemplatesGroupChanged = uuidTemplatesGroup.lastModificationTime
         } else {
             entryTemplatesGroup = UUID_ZERO
             mTemplateEngine.clearCache()
@@ -356,11 +359,6 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         return null
     }
 
-    fun setTemplatesGroup(uuid: UUID) {
-        entryTemplatesGroup = uuid
-        entryTemplatesGroupChanged = DateInstant()
-    }
-
     fun getTemplates(): List<Template> {
         return mTemplateEngine.getTemplates()
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngine.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngine.kt
index cbe8f6ef0..30efa1fea 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngine.kt
@@ -3,6 +3,8 @@ package com.kunzisoft.keepass.database.element.template
 import android.util.Log
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.utils.UuidUtil
 import java.util.*
 import kotlin.collections.HashMap
@@ -31,6 +33,16 @@ class TemplateEngine(private val databaseKDBX: DatabaseKDBX) {
         return templates
     }
 
+    fun createNewTemplatesGroup(): GroupKDBX {
+        return databaseKDBX.createGroup().apply {
+            title = TEMPLATE_GROUP_NAME
+            icon.standard = databaseKDBX.getStandardIcon(IconImageStandard.FOLDER_ID)
+            enableAutoType = false
+            enableSearching = false
+            isExpanded = false
+        }
+    }
+
     fun clearCache() {
         mCacheTemplates.clear()
     }
@@ -159,6 +171,7 @@ class TemplateEngine(private val databaseKDBX: DatabaseKDBX) {
         private data class TemplateAttributePosition(var position: Int, var attribute: TemplateAttribute)
 
         private val TAG = TemplateEngine::class.java.name
+        private const val TEMPLATE_GROUP_NAME = "Templates"
         private const val TEMPLATE_LABEL_VERSION = "_etm_template"
         private const val TEMPLATE_ENTRY_UUID = "_etm_template_uuid"
         private const val TEMPLATE_ATTRIBUTE_POSITION_PREFIX = "_etm_position"
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
index 6f82f3665..740f560c6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
@@ -159,13 +159,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() {
                     isEnabled = if (!mDatabaseReadOnly) {
                         setOnPreferenceChangeListener { _, newValue ->
                             val recycleBinEnabled = newValue as Boolean
-                            mDatabase.isRecycleBinEnabled = recycleBinEnabled
-                            // TODO Change method
-                            if (recycleBinEnabled) {
-                                mDatabase.ensureRecycleBinExists(resources)
-                            } else {
-                                mDatabase.removeRecycleBin()
-                            }
+                            mDatabase.enableRecycleBin(recycleBinEnabled, resources)
                             refreshRecycleBinGroup()
                             // Save the database if not in readonly mode
                             (context as SettingsActivity?)?.
@@ -193,7 +187,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() {
                     isEnabled = if (!mDatabaseReadOnly) {
                         setOnPreferenceChangeListener { _, newValue ->
                             val templatesEnabled = newValue as Boolean
-                            mDatabase.isTemplatesEnabled = templatesEnabled
+                            mDatabase.enableTemplates(templatesEnabled)
                             refreshTemplatesGroup()
                             // Save the database if not in readonly mode
                             (context as SettingsActivity?)?.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1ec435d0a..d09c12efa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -411,7 +411,7 @@
     <string name="compression_none">None</string>
     <string name="compression_gzip">Gzip</string>
     <string name="recycle_bin">Recycle bin</string>
-    <string name="templates">Recycle bin</string>
+    <string name="templates">Templates</string>
     <string name="keyboard">Keyboard</string>
     <string name="magic_keyboard_title">Magikeyboard</string>
     <string name="magic_keyboard_explanation_summary">Activate a custom keyboard populating your passwords and all identity fields</string>