diff --git a/app/imports/api/properties/Spells.js b/app/imports/api/properties/Spells.js
index 831fac0c..8467b7e1 100644
--- a/app/imports/api/properties/Spells.js
+++ b/app/imports/api/properties/Spells.js
@@ -25,6 +25,10 @@ let SpellSchema = new SimpleSchema({})
 		type: Boolean,
 		optional: true,
 	},
+  prepared: {
+		type: Boolean,
+		optional: true,
+	},
   // This spell ignores spell slot rules
   castWithoutSpellSlots: {
     type: Boolean,
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/ui/properties/forms/SpellForm.vue
index f975578e..ac5b9bce 100644
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/ui/properties/forms/SpellForm.vue
@@ -1,5 +1,23 @@
 <template lang="html">
-  <div class="attribute-form">
+  <div class="spell-form">
+    <div class="layout row wrap justify-space-between">
+      <smart-switch
+        label="Prepared"
+        style="width: 200px; flex-grow: 0;"
+        class="mx-2"
+        :value="model.prepared"
+        :error-messages="errors.prepared"
+        @change="change('prepared', ...arguments)"
+      />
+      <smart-switch
+        label="Always prepared"
+        style="width: 200px; flex-grow: 0;"
+        class="mx-2"
+        :value="model.alwaysPrepared"
+        :error-messages="errors.alwaysPrepared"
+        @change="change('alwaysPrepared', ...arguments)"
+      />
+    </div>
     <text-field
       ref="focusFirst"
       label="Name"
@@ -27,16 +45,6 @@
         @change="change('school', ...arguments)"
       />
     </div>
-    <div class="layout row wrap">
-      <smart-switch
-        label="Always prepared"
-        style="width: 200px; flex-grow: 0;"
-        class="ml-2"
-        :value="model.alwaysPrepared"
-        :error-messages="errors.alwaysPrepared"
-        @change="change('alwaysPrepared', ...arguments)"
-      />
-    </div>
     <text-field
       label="Casting Time"
       :value="model.castingTime"