diff --git a/src/components/Cards/CreateWikiWizardStepTwo.vue b/src/components/Cards/AudienceAndPurposeWizardStep.vue
similarity index 99%
rename from src/components/Cards/CreateWikiWizardStepTwo.vue
rename to src/components/Cards/AudienceAndPurposeWizardStep.vue
index 229dcc17..e5a8bc91 100644
--- a/src/components/Cards/CreateWikiWizardStepTwo.vue
+++ b/src/components/Cards/AudienceAndPurposeWizardStep.vue
@@ -115,7 +115,7 @@
 
 <script>
 export default {
-  name: 'StepTwoCard',
+  name: 'AudienceAndPurposeWizardStep',
   props: {
     title: String,
     inFlight: Boolean,
diff --git a/src/components/Cards/CreateWiki.vue b/src/components/Cards/CreateWiki.vue
index e5cc4e45..59b4090f 100644
--- a/src/components/Cards/CreateWiki.vue
+++ b/src/components/Cards/CreateWiki.vue
@@ -1,6 +1,6 @@
 <template>
   <v-form @submit="createWiki">
-    <step-one-card
+    <SiteDetailsCreateWikiWizardStep
       v-show="step === 1"
       :title="title"
       :inFlight="inFlight"
@@ -12,7 +12,7 @@
       @next-step="goToStep(2)"
     />
 
-    <step-two-card
+    <AudienceAndPurposeWizardStep
       v-show="step === 2"
       :title="title"
       :inFlight="inFlight"
@@ -22,13 +22,11 @@
       @next-step="goToStep(3)"
     />
 
-    <step-three-card
+    <TemporalityCreateWikiWizardStep
       v-show="step === 3"
       :title="title"
       :inFlight="inFlight"
       :error="error"
-      :dismissable="false"
-      submitButtonText="Create Wiki"
       v-model="stepThree"
       @previous-step="goToStep(2)"
       @submit="createWiki"
@@ -38,20 +36,19 @@
 
 <script>
 import config from '~/config'
-import StepOneCard from './CreateWikiWizardStepOne.vue'
-import StepTwoCard from './CreateWikiWizardStepTwo.vue'
-import StepThreeCard from './CreateWikiWizardStepThree.vue'
+import SiteDetailsCreateWikiWizardStep from './SiteDetailsCreateWikiWizardStep.vue'
+import AudienceAndPurposeWizardStep from './AudienceAndPurposeWizardStep.vue'
+import TemporalityCreateWikiWizardStep from './TemporalityCreateWikiWizardStep.vue'
 
 export default {
   name: 'CreateWiki',
   components: {
-    StepOneCard,
-    StepTwoCard,
-    StepThreeCard
+    SiteDetailsCreateWikiWizardStep,
+    AudienceAndPurposeWizardStep,
+    TemporalityCreateWikiWizardStep
   },
   props: [
-    'title',
-    'buttonText'
+    'title'
   ],
   computed: {
     currentUser: function () {
@@ -90,8 +87,6 @@ export default {
     }
   },
   created () {
-    // what's this for?
-    // this.buttonText = this.buttonTexts.next;
     this.checkCurrentLogin()
   },
   updated () {
diff --git a/src/components/Cards/CreateWikiWizardStepOne.vue b/src/components/Cards/SiteDetailsCreateWikiWizardStep.vue
similarity index 99%
rename from src/components/Cards/CreateWikiWizardStepOne.vue
rename to src/components/Cards/SiteDetailsCreateWikiWizardStep.vue
index 3f330bfa..3d9c06a5 100644
--- a/src/components/Cards/CreateWikiWizardStepOne.vue
+++ b/src/components/Cards/SiteDetailsCreateWikiWizardStep.vue
@@ -114,7 +114,7 @@
 
 <script>
 export default {
-  name: 'StepOneCard',
+  name: 'SiteDetailsCreateWikiWizardStep',
   props: {
     title: String,
     inFlight: Boolean,
diff --git a/src/components/Cards/TemporalityCreateWikiWizardStep.vue b/src/components/Cards/TemporalityCreateWikiWizardStep.vue
new file mode 100644
index 00000000..98bffe82
--- /dev/null
+++ b/src/components/Cards/TemporalityCreateWikiWizardStep.vue
@@ -0,0 +1,130 @@
+<template>
+  <v-card class="elevation-12">
+    <v-toolbar dark color="primary">
+      <v-toolbar-title>{{ title }}</v-toolbar-title>
+    </v-toolbar>
+
+    <v-card-text>
+      <v-form ref="inputForm" v-on:submit.prevent>
+        <h3>How long do you plan to use this Wikibase?</h3>
+
+        <v-radio-group
+          v-model="value.temporality"
+          :error-messages=error
+          :rules="[() => !!value.temporality || 'Please select an option.']"
+        >
+          <v-radio value="permanent" ref="test">
+            <template v-slot:label>
+              I would prefer to keep it on a permanent basis
+            </template>
+          </v-radio>
+          <v-radio value="temporary">
+            <template v-slot:label>
+              It is temporary/disposable. I will no longer need it after it served its purpose
+            </template>
+          </v-radio>
+
+          <v-radio value="other">
+            <template v-slot:label>
+              Other: <v-text-field
+              dense
+              counter="200"
+              class="pl-1 mt-n1 mb-n2"
+              v-model="value.otherTemporality"
+              :rules="
+              [
+                () => value.temporality !== 'other'
+                  || !! value.otherTemporality
+                  || 'Please provide a response.',
+
+                () => value.temporality !== 'other'
+                  || !! (value.otherTemporality && value.otherTemporality.length < 201)
+                  || 'Text must be 200 characters or less.'
+              ]"
+            ></v-text-field>
+            </template>
+          </v-radio>
+          <v-radio value="decide_later">
+            <template v-slot:label>
+              I will decide later
+            </template>
+          </v-radio>
+        </v-radio-group>
+        <h3 class="mt-6">Terms of Use</h3>
+        <div class="body-2">
+          Previously accepted
+          <v-tooltip top>
+            <template v-slot:activator="{ on }">
+              <a
+                target="_blank"
+                href="/terms-of-use"
+                @click.stop
+                v-on="on"
+              >
+                Terms of Use</a>
+            </template>
+            Opens in new window
+          </v-tooltip> still apply.
+        </div>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        type="button"
+        :disabled="inFlight"
+        @click="previousStep"
+      >
+        &lt; Previous
+      </v-btn>
+
+      <v-btn
+        type="button"
+        color="primary"
+        :disabled="inFlight"
+        @click="submitWholeForm"
+      >
+        Create Wiki
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+export default {
+  name: 'TemporalityCreateWikiWizardStep',
+  props: {
+    title: String,
+    inFlight: Boolean,
+    value: Object,
+    error: Array
+  },
+  methods: {
+    previousStep () {
+      if (this.value.temporality !== 'other') {
+        this.value.otherTemporality = undefined
+      }
+
+      this.$emit('previous-step')
+    },
+    submitWholeForm () {
+      if (this.value.temporality !== 'other') {
+        this.value.otherTemporality = undefined
+      }
+
+      this.$refs.inputForm.validate()
+      if (this.$refs.inputForm.validate() === true) {
+        this.$emit('submit')
+      }
+    }
+  }
+
+}
+</script>
+
+<style lang="css" scoped>
+.v-card__actions {
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  gap: 8px;
+}
+</style>
diff --git a/src/components/Pages/CreateWiki.vue b/src/components/Pages/CreateWiki.vue
index 1123ab2c..e981a0f7 100644
--- a/src/components/Pages/CreateWiki.vue
+++ b/src/components/Pages/CreateWiki.vue
@@ -3,7 +3,7 @@
       <v-container class="fill-height" fluid >
         <v-row align="center" justify="center">
           <v-col class="card-column">
-            <CreateWikiCard title="Create a wiki" buttonText="Next >"/>
+            <CreateWikiCard title="Create a wiki"/>
           </v-col>
         </v-row>
       </v-container>
diff --git a/src/components/Pages/ManageWiki/Cards/Profile.vue b/src/components/Pages/ManageWiki/Cards/Profile.vue
index 5a384ea4..121b4412 100644
--- a/src/components/Pages/ManageWiki/Cards/Profile.vue
+++ b/src/components/Pages/ManageWiki/Cards/Profile.vue
@@ -5,7 +5,7 @@
         content-class="update-wiki-profile-dialog"
         v-model="dialog.show"
       >
-        <step-two-card
+        <AudienceAndPurposeWizardStep
           v-show="dialog.step === 1"
           :title="dialog.title"
           :inFlight="inFlight"
@@ -14,14 +14,12 @@
           @close-dialog="dialog.show = false"
           @next-step="goToStep(2)"
         />
-        <step-three-card
+        <TemporalityProfileEditWizardStep
           v-show="dialog.step === 2"
           :title="dialog.title"
           :inFlight="inFlight"
           :error="dialog.error"
-          :dismissable="true"
           :showTerms="false"
-          submitButtonText="Set intended use"
           v-model="dialog.data.stepTwo"
           @close-dialog="dialog.show = false"
           @previous-step="goToStep(1)"
@@ -78,8 +76,8 @@
 
 <script>
 import Message from '../Features/Message.vue'
-import StepTwoCard from '~/components/Cards/CreateWikiWizardStepTwo'
-import StepThreeCard from '~/components/Cards/CreateWikiWizardStepThree'
+import AudienceAndPurposeWizardStep from '../../../Cards/AudienceAndPurposeWizardStep.vue'
+import TemporalityProfileEditWizardStep from './TemporalityProfileEditWizardStep.vue'
 
 const providedResponses = {
   purpose: {
@@ -104,8 +102,8 @@ export default {
   name: 'Profile',
   components: {
     Message,
-    StepTwoCard,
-    StepThreeCard
+    AudienceAndPurposeWizardStep,
+    TemporalityProfileEditWizardStep
   },
   props: [
     'wikiId'
diff --git a/src/components/Cards/CreateWikiWizardStepThree.vue b/src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue
similarity index 94%
rename from src/components/Cards/CreateWikiWizardStepThree.vue
rename to src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue
index 0c1874f0..21cd17f0 100644
--- a/src/components/Cards/CreateWikiWizardStepThree.vue
+++ b/src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue
@@ -3,7 +3,7 @@
       <v-toolbar dark color="primary">
         <v-toolbar-title>{{ title }}</v-toolbar-title>
         <v-spacer></v-spacer>
-        <v-btn v-if="dismissable" icon @click="$emit('close-dialog')">
+        <v-btn icon @click="$emit('close-dialog')">
           <v-icon>mdi-close</v-icon>
         </v-btn>
       </v-toolbar>
@@ -87,7 +87,7 @@
           :disabled="inFlight"
           @click="submitWholeForm"
         >
-          {{ submitButtonText }}
+          Set intended use
         </v-btn>
       </v-card-actions>
     </v-card>
@@ -95,14 +95,12 @@
 
 <script>
 export default {
-  name: 'StepThreeCard',
+  name: 'TemporalityProfileEditWizardStep',
   props: {
     title: String,
     inFlight: Boolean,
     value: Object,
-    error: Array,
-    dismissable: Boolean,
-    submitButtonText: String
+    error: Array
   },
   methods: {
     previousStep () {