diff --git a/src/components/Faucet.vue b/src/components/Faucet.vue
index 30e208b..026b61c 100644
--- a/src/components/Faucet.vue
+++ b/src/components/Faucet.vue
@@ -1,5 +1,5 @@
 <template>
-  <phone-card v-if="s.mockenv">
+  <phone-card v-if="s.mockenv && s.vault">
     <v-card-title><v-icon icon="mdi-faucet"/>&nbsp;Mock Coin Faucet</v-card-title>
     <v-card-text>Mockchain provides infinite amounts of MOCK (Mockcoin) and USD (Universally Stable Denomination) for your vault. Click the button below to get a million of each: </v-card-text>
     <v-card-item>
diff --git a/src/components/Vault.vue b/src/components/Vault.vue
index 39fd4f0..0097131 100644
--- a/src/components/Vault.vue
+++ b/src/components/Vault.vue
@@ -27,7 +27,7 @@
       <v-card-title><v-icon icon="mdi-safe-square-outline" size="small" color="red"/> No Vault Yet</v-card-title>
       <v-card-text v-if="num!==0"><!--todo-->Multiple vaults are not yet supported</v-card-text>
       <v-card-text v-if="num===0">Create an order first, then your vault account will appear here to accept a deposit of trading funds.</v-card-text>
-      <v-card-actions><v-btn prepend-icon="mdi-plus" text="Create Order" @click="$router.push('/orders')"/></v-card-actions>
+      <v-card-actions><v-btn prepend-icon="mdi-plus" text="Create Order" @click="$router.push('/twap')"/></v-card-actions>
     </v-card>
     <v-card v-if="s.vaults.length>num">
       <v-card-title><v-icon icon="mdi-safe-square-outline" size="small"/> My Vault {{s.vaults.length>1?'#'+(num+1):''}}</v-card-title> <!-- todo vault nicknames -->