diff --git a/app/imports/api/creature/creatures/methods/removeCreature.js b/app/imports/api/creature/creatures/methods/removeCreature.js
index 66eaa0b4..d157f5d7 100644
--- a/app/imports/api/creature/creatures/methods/removeCreature.js
+++ b/app/imports/api/creature/creatures/methods/removeCreature.js
@@ -3,11 +3,13 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertOwnership } from '/imports/api/creature/creatures/creaturePermissions.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 
 function removeRelatedDocuments(creatureId){
+  CreatureVariables.remove({_creatureId: creatureId});
   CreatureProperties.remove({'ancestors.id': creatureId});
   CreatureLogs.remove({creatureId});
   Experiences.remove({creatureId});
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index 04858b8f..1c5bfde3 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -1,9 +1,9 @@
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { EJSON } from 'meteor/ejson';
-import { omitBy } from 'lodash';
 
 export default function writeScope(creatureId, computation) {
+  if (!creatureId) throw 'creatureId is required';
   const scope = computation.scope;
   const variables = computation.variables || {};
   delete variables._id;
@@ -50,7 +50,7 @@ export default function writeScope(creatureId, computation) {
     if ($unset) update.$unset = $unset;
     CreatureVariables.upsert({_creatureId: creatureId}, update);
   }
-  if (computation.creature.dirty) {
+  if (computation.creature?.dirty) {
     Creatures.update({_creatureId: creatureId}, {$unset: { dirty: 1 }});
   }
 }
diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/ui/creature/character/CharacterSheet.vue
index 9edaf0fb..0b4870f0 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/ui/creature/character/CharacterSheet.vue
@@ -129,6 +129,16 @@ if<template>
     },
     mounted(){
       this.$store.commit('setPageTitle', this.creature && this.creature.name || 'Character Sheet');
+      this.nameObserver = Creatures.find({
+        creatureId: this.creatureId,
+      }, {
+        fields: {name: 1},
+      }).observe({
+        added: ({name}) => 
+          this.$store.commit('setPageTitle', name || 'Character Sheet'),
+        changed: ({ name }) =>
+          this.$store.commit('setPageTitle', name || 'Character Sheet'),
+      });
       let that = this;
       this.logObserver = CreatureLogs.find({
         creatureId: this.creatureId,
@@ -141,6 +151,7 @@ if<template>
       });
     },
     beforeDestroy(){
+      this.nameObserver.stop();
       this.logObserver.stop();
     },
 		meteor: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index d9ae0e03..727e1d1a 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -143,12 +143,6 @@ export default {
       return highestLevelsList;
     },
   },
-  mounted(){
-    if (this.$store.state.showDetailsDialog){
-      this.$store.commit('setShowDetailsDialog', false);
-      this.showCharacterForm();
-    }
-  },
   meteor: {
     creature(){
       return Creatures.findOne(this.creatureId);
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 17dfce2d..53f98146 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -454,9 +454,10 @@
 				return getAttributeOfType(this.creature, 'spellSlot');
 			},
       hasSpells(){
-        return getProperties(this.creature, {
+        const cursor = getProperties(this.creature, {
           type: 'spell',
-        }).count();
+        })
+        return cursor && cursor.count();
       },
 			hitDice(){
         return getAttributeOfType(this.creature, 'hitDice');
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 8fb87bc7..c3ccea03 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,5 +1,6 @@
 const AddCreaturePropertyDialog = () => import('/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue');
 const ArchiveDialog = () => import('/imports/ui/creature/archive/ArchiveDialog.vue');
+const CharacterCreationDialog = () => import('/imports/ui/creature/character/CharacterCreationDialog.vue');
 const CastSpellWithSlotDialog = () => import('/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue');
 const CreatureFormDialog = () => import('/imports/ui/creature/CreatureFormDialog.vue');
 const CreaturePropertyCreationDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue');
@@ -28,6 +29,7 @@ export default {
   AddCreaturePropertyDialog,
   ArchiveDialog,
   CastSpellWithSlotDialog,
+  CharacterCreationDialog,
   CreatureFormDialog,
   CreaturePropertyCreationDialog,
   CreaturePropertyDialog,
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 953530a5..05a8c707 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -74,6 +74,7 @@
 </template>
 
 <script lang="js">
+  import { defer } from 'lodash';
   import Creatures from '/imports/api/creature/creatures/Creatures.js';
   import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
   import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
@@ -159,7 +160,7 @@
     },
     methods: {
       insertCharacter(){
-        insertCreature.call((error, result) => {
+        insertCreature.call((error, creatureId) => {
           if (error){
             console.error(error);
             snackbar({
@@ -168,10 +169,18 @@
           } else {
             this.$store.commit(
               'setTabForCharacterSheet',
-              {id: result, tab: 4}
+              {id: creatureId, tab: 4}
             );
-            this.$store.commit('setShowDetailsDialog', true);
-            this.$router.push({ path: `/character/${result}`});
+            defer(() => {
+              this.$store.commit('pushDialogStack', {
+                component: 'character-creation-dialog',
+                elementId: 'new-character-button',
+                data: {
+                  creatureId,
+                },
+              });
+            })
+            this.$router.push({ path: `/character/${creatureId}` });
           }
         });
       },