diff --git a/app/src/renderer/components/common/NiFieldSeed.vue b/app/src/renderer/components/common/NiFieldSeed.vue
index 74f7bce038..98276d4d23 100644
--- a/app/src/renderer/components/common/NiFieldSeed.vue
+++ b/app/src/renderer/components/common/NiFieldSeed.vue
@@ -25,5 +25,5 @@ export default {
 @require '~variables'
 
 .ni-field.ni-field-seed
-  height 5rem
+  height 6rem
 </style>
diff --git a/app/src/renderer/components/common/NiHardwareState.vue b/app/src/renderer/components/common/NiHardwareState.vue
index 32e4437c41..83f028a07a 100644
--- a/app/src/renderer/components/common/NiHardwareState.vue
+++ b/app/src/renderer/components/common/NiHardwareState.vue
@@ -24,7 +24,7 @@ export default {
   flex-flow column nowrap
   align-items center
   justify-content center
-  margin 0 auto
+  margin 1.5rem auto
 
   height 15rem
   width 15rem
diff --git a/app/src/renderer/components/common/NiSession.vue b/app/src/renderer/components/common/NiSession.vue
index ae9e56f4de..4fe237b97d 100644
--- a/app/src/renderer/components/common/NiSession.vue
+++ b/app/src/renderer/components/common/NiSession.vue
@@ -179,7 +179,9 @@ export default {
     &:not(.ni-form)
     &.ni-form .ni-form-main
       width 32rem
-      height 36rem
+      min-height 28rem
+      max-height 90vh
+      height auto
 
   .ni-session-header
     background app-fg
diff --git a/app/src/renderer/components/common/NiSessionSignIn.vue b/app/src/renderer/components/common/NiSessionSignIn.vue
index 8ca737e3f4..36dc93ac2d 100644
--- a/app/src/renderer/components/common/NiSessionSignIn.vue
+++ b/app/src/renderer/components/common/NiSessionSignIn.vue
@@ -1,9 +1,17 @@
 <template lang="pug">
 .ni-session: form-struct(:submit='onSubmit').ni-session-container
   .ni-session-header
+    a(@click="setState('welcome')"): i.material-icons arrow_back
     .ni-session-title Sign In
     a(@click="help"): i.material-icons help_outline
   .ni-session-main
+    form-group(field-id='sign-in-name' field-label='Select Account')
+      field#sign-in-name(
+        type="select"
+        v-model="fields.signInName"
+        :options="accounts")
+      form-msg(name='Name' type='required' v-if='!$v.fields.signInName.required')
+
     form-group(:error='$v.fields.signInPassword.$error'
       field-id='sign-in-password' field-label='Password')
       field#sign-in-password(
@@ -11,13 +19,12 @@
         v-model="fields.signInPassword")
       form-msg(name='Password' type='required' v-if='!$v.fields.signInPassword.required')
       form-msg(name='Password' type='minLength' min="10" v-if='!$v.fields.signInPassword.minLength')
-    form-group
-      a(@click="setState('delete')") Sign Out and Remove Account
   .ni-session-footer
     btn(icon="arrow_forward" icon-pos="right" value="Next" size="lg")
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
 import {required, minLength} from 'vuelidate/lib/validators'
 import Btn from '@nylira/vue-button'
 import Field from '@nylira/vue-field'
@@ -37,6 +44,7 @@ export default {
   },
   data: () => ({
     fields: {
+      signInName: '',
       signInPassword: ''
     }
   }),
@@ -47,8 +55,8 @@ export default {
       this.$v.$touch()
       if (this.$v.$error) return
       try {
-        await this.$store.dispatch('testLogin', {password: this.fields.signInPassword})
-        this.$store.dispatch('signIn', {password: this.fields.signInPassword})
+        await this.$store.dispatch('testLogin', { password: this.fields.signInPassword, account: this.fields.signInName })
+        this.$store.dispatch('signIn', { password: this.fields.signInPassword, account: this.fields.signInName })
         this.$store.commit('setModalSession', false)
         this.$store.commit('notify', { title: 'Signed In', body: `You are now signed in to your Cosmos account.` })
       } catch (err) {
@@ -56,11 +64,20 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters(['user']),
+    accounts () {
+      let accounts = this.user.accounts
+      accounts = accounts.filter((name) => name !== 'trunk')
+      return accounts.map((name) => ({ key: name, value: name }))
+    }
+  },
   mounted () {
-    this.$el.querySelector('#sign-in-password').focus()
+    this.$el.querySelector('#sign-in-name').focus()
   },
   validations: () => ({
     fields: {
+      signInName: { required },
       signInPassword: { required, minLength: minLength(10) }
     }
   })
diff --git a/app/src/renderer/components/common/NiSessionSignUp.vue b/app/src/renderer/components/common/NiSessionSignUp.vue
index 15dd2446f8..827c3f80b3 100644
--- a/app/src/renderer/components/common/NiSessionSignUp.vue
+++ b/app/src/renderer/components/common/NiSessionSignUp.vue
@@ -5,19 +5,27 @@
     .ni-session-title Create Account
     a(@click="help"): i.material-icons help_outline
   .ni-session-main
+    form-group(field-id='sign-up-name' field-label='Account Name' :error='$v.fields.signUpName.$error')
+      field#sign-up-name(
+        type="text"
+        placeholder="at least 5 characters"
+        v-model="fields.signUpName")
+      form-msg(name='Name' type='required' v-if='!$v.fields.signUpName.required')
+      form-msg(name='Name' type='minLength' min="5" v-if='!$v.fields.signUpName.minLength')
+
     form-group(field-id='sign-up-seed' field-label='Seed (write it down)')
       field-seed#sign-up-seed(v-model="fields.signUpSeed" disabled)
       form-msg(body='Please back up the seed phrase for this account. These words cannot be recovered!')
 
-    form-group(:error='$v.fields.signInPassword.$error'
+    form-group(:error='$v.fields.signUpPassword.$error'
       field-id='sign-in-password' field-label='Password')
       field#sign-in-password(
         type="password"
         placeholder="at least 10 characters"
-        v-model="fields.signInPassword")
+        v-model="fields.signUpPassword")
       form-msg(body="Create a password to secure your new account")
-      form-msg(name='Password' type='required' v-if='!$v.fields.signInPassword.required')
-      form-msg(name='Password' type='minLength' min="10" v-if='!$v.fields.signInPassword.minLength')
+      form-msg(name='Password' type='required' v-if='!$v.fields.signUpPassword.required')
+      form-msg(name='Password' type='minLength' min="10" v-if='!$v.fields.signUpPassword.minLength')
 
     form-group(field-id="sign-up-warning" field-label=' '
       :error='$v.fields.signUpWarning.$error')
@@ -63,8 +71,9 @@ export default {
   data: () => ({
     creating: true,
     fields: {
+      signUpName: '',
       signUpSeed: 'Creating seed...',
-      signInPassword: '',
+      signUpPassword: '',
       signUpWarning: false,
       signUpBackup: false
     }
@@ -75,16 +84,16 @@ export default {
     async onSubmit () {
       this.$v.$touch()
       if (this.$v.$error) return
-      let key = await this.$store.dispatch('createKey', { seedPhrase: this.fields.signUpSeed, password: this.fields.signInPassword })
+      let key = await this.$store.dispatch('createKey', { seedPhrase: this.fields.signUpSeed, password: this.fields.signUpPassword, name: this.fields.signUpName })
       if (key) {
         this.$store.commit('setModalSession', false)
         this.$store.commit('notify', { title: 'Signed Up', body: 'Your account has been created.' })
-        this.$store.dispatch('signIn', {password: this.fields.signInPassword})
+        this.$store.dispatch('signIn', { password: this.fields.signUpPassword, account: this.fields.signUpName })
       }
     }
   },
   mounted () {
-    this.$el.querySelector('#sign-up-warning').focus()
+    this.$el.querySelector('#sign-up-name').focus()
     this.$store.dispatch('createSeed')
       .then(seedPhrase => {
         this.creating = false
@@ -93,7 +102,8 @@ export default {
   },
   validations: () => ({
     fields: {
-      signInPassword: { required, minLength: minLength(10) },
+      signUpName: { required, minLength: minLength(5) },
+      signUpPassword: { required, minLength: minLength(10) },
       signUpWarning: { required },
       signUpBackup: { required }
     }
diff --git a/app/src/renderer/components/common/NiSessionWelcome.vue b/app/src/renderer/components/common/NiSessionWelcome.vue
index 3496c64bc3..5e4eaff9cb 100644
--- a/app/src/renderer/components/common/NiSessionWelcome.vue
+++ b/app/src/renderer/components/common/NiSessionWelcome.vue
@@ -5,6 +5,12 @@
     .ni-session-title Welcome to Cosmos!
     a(@click="help"): i.material-icons help_outline
   .ni-session-main
+    li-session(
+      v-if="accountExists"
+      @click.native="setState('sign-in')"
+      icon="lock"
+      title="Sign in with password"
+      subtitle="If you have an account, choose this option")
     li-session(
       @click.native="setState('sign-up')"
       icon="create"
@@ -35,7 +41,8 @@ export default {
     LiSession
   },
   computed: {
-    ...mapGetters(['config'])
+    ...mapGetters(['config', 'user']),
+    accountExists () { return this.user.accounts.length > 0 }
   },
   methods: {
     help () { this.$store.commit('setModalHelp', true) },
diff --git a/app/src/renderer/components/common/NiToolBar.vue b/app/src/renderer/components/common/NiToolBar.vue
index b1a77f4da7..7564f3711f 100644
--- a/app/src/renderer/components/common/NiToolBar.vue
+++ b/app/src/renderer/components/common/NiToolBar.vue
@@ -52,14 +52,14 @@ export default {
       top 3rem
       right 0
 
-      background hover
+      background bc
       border-radius 0.25rem
 
       line-height 2.5rem
 
       padding 0 0.75rem
 
-      color bright
+      color txt
       z-index 101
 
       white-space nowrap
@@ -76,7 +76,7 @@ export default {
         height 0
         border-left 0.375rem solid transparent
         border-right 0.375rem solid transparent
-        border-bottom 0.375rem solid hover
+        border-bottom 0.375rem solid bc
 
         display block
         content ''
diff --git a/app/src/renderer/components/common/NiUserPane.vue b/app/src/renderer/components/common/NiUserPane.vue
index 74d4be764f..8dc713fd4e 100644
--- a/app/src/renderer/components/common/NiUserPane.vue
+++ b/app/src/renderer/components/common/NiUserPane.vue
@@ -6,12 +6,12 @@ list-item.ni-li-user(
   @click.native="close"
   icon="face"
   title="CosmosUser01")
-div(v-else-if="user.signedIn") 
+div(v-else-if="user.signedIn")
   list-item.ni-li-user(
     type="link"
-    icon="mood"
+    icon="exit_to_app"
     @click.native="signOut"
-    title="Signed In (Sign Out)")
+    title="Sign Out")
 list-item.ni-li-user(
   v-else
   @click.native="openSession"
@@ -59,4 +59,7 @@ export default {
   border-top px solid bc
   height 3rem + px
   cursor: pointer
+
+  .ni-li-title
+    color link
 </style>
diff --git a/app/src/renderer/components/wallet/PageBalances.vue b/app/src/renderer/components/wallet/PageBalances.vue
index 58d3b24767..6cc21f4908 100644
--- a/app/src/renderer/components/wallet/PageBalances.vue
+++ b/app/src/renderer/components/wallet/PageBalances.vue
@@ -19,7 +19,7 @@ page(title='Balance')
       :key="i.denom"
       :dt="i.denom.toUpperCase()"
       :dd="i.amount")
-    list-item(v-if='wallet.balances.length === 0' dt="N/A" dd="None Available")
+    list-item(v-if='wallet.denoms.length === 0 && wallet.balances.length === 0' dt="N/A" dd="None Available")
 </template>
 
 <script>
diff --git a/app/src/renderer/styles/variables.styl b/app/src/renderer/styles/variables.styl
index 32be3f2d02..41263161e6 100644
--- a/app/src/renderer/styles/variables.styl
+++ b/app/src/renderer/styles/variables.styl
@@ -21,7 +21,7 @@ app-bg-hover = hsl(app-hue, 33%, 20%)
 // text
 bright = #fff
 txt = hsl(app-hue, 13%, 85%)
-dim = hsl(app-hue, 13%, 69%)
+dim = hsl(app-hue, 13%, 60%)
 
 // borders
 bc = hsl(app-hue, 22%, 23%)
diff --git a/app/src/renderer/vuex/modules/user.js b/app/src/renderer/vuex/modules/user.js
index cddc5c7b57..9202f23d68 100644
--- a/app/src/renderer/vuex/modules/user.js
+++ b/app/src/renderer/vuex/modules/user.js
@@ -1,5 +1,3 @@
-import { KEY_PASSWORD, KEY_NAME } from './wallet'
-
 export default ({ commit, node }) => {
   const emptyNomination = {
     keybase: '',
@@ -20,7 +18,8 @@ export default ({ commit, node }) => {
     delegation: [],
     pubkey: '',
     privkey: null,
-    signedIn: false
+    signedIn: false,
+    accounts: []
   }
 
   const state = JSON.parse(JSON.stringify(emptyUser))
@@ -28,27 +27,29 @@ export default ({ commit, node }) => {
   const mutations = {
     activateDelegation (state) {
       state.delegationActive = true
+    },
+    setAccounts (state, accounts) {
+      state.accounts = accounts
     }
   }
 
   const actions = {
     async showInitialScreen ({ dispatch }) {
-      let exists = await dispatch('accountExists')
+      await dispatch('loadAccounts')
+      let exists = state.accounts.length > 0
       let screen = exists ? 'sign-in' : 'welcome'
       commit('setModalSessionState', screen)
       commit('setModalSession', true)
     },
-    async accountExists (state, account = KEY_NAME) {
+    async loadAccounts ({ commit }) {
       try {
         let keys = await node.listKeys()
-        return !!keys.find(key => key.name === account)
+        commit('setAccounts', keys.map((key) => key.name))
       } catch (err) {
-        commit('notifyError', { title: `Couldn't read keys'`, body: err.message })
+        commit('notifyError', { title: `Couldn't read keys`, body: err.message })
       }
     },
-    // testing if the provided password works so we can show the user early if he uses the wrong password
-    // testing this by trying to change the password... to the same password...
-    async testLogin (state, {password, account = KEY_NAME}) {
+    async testLogin (state, { password, account }) {
       try {
         return await node.updateKey(account, {
           name: account,
@@ -62,41 +63,42 @@ export default ({ commit, node }) => {
     // to create a temporary seed phrase, we create a junk account with name 'trunk' for now
     async createSeed ({ commit }) {
       let JUNK_ACCOUNT_NAME = 'trunk'
+      let TRUNK_PASSWORD = '1234567890'
       try {
         // cleanup an existing junk account
         let keys = await node.listKeys()
         if (keys.find(key => key.name === JUNK_ACCOUNT_NAME)) {
           await node.deleteKey(JUNK_ACCOUNT_NAME, {
-            password: KEY_PASSWORD,
+            password: TRUNK_PASSWORD,
             name: JUNK_ACCOUNT_NAME
           })
         }
 
         // generate seedPhrase with junk account
-        let temporaryKey = await node.generateKey({ name: JUNK_ACCOUNT_NAME, password: KEY_PASSWORD })
+        let temporaryKey = await node.generateKey({ name: JUNK_ACCOUNT_NAME, password: TRUNK_PASSWORD })
         return temporaryKey.seed_phrase
       } catch (err) {
-        commit('notifyError', { title: 'Couln\'t create a seed', body: err.message })
+        commit('notifyError', { title: `Couldn't create a seed`, body: err.message })
       }
     },
-    async createKey ({ commit, dispatch }, { seedPhrase, password, name = KEY_NAME }) {
+    async createKey ({ commit, dispatch }, { seedPhrase, password, name }) {
       try {
         let {key} = await node.recoverKey({ name, password, seed_phrase: seedPhrase })
         dispatch('initializeWallet', key)
         return key
       } catch (err) {
-        commit('notifyError', { title: 'Couln\'t create a key', body: err.message })
+        commit('notifyError', { title: `Couldn't create a key`, body: err.message })
       }
     },
-    async deleteKey ({ commit, dispatch }, { password, name = KEY_NAME }) {
+    async deleteKey ({ commit, dispatch }, { password, name }) {
       try {
         await node.deleteKey(name, { name, password })
         return true
       } catch (err) {
-        commit('notifyError', { title: `Couln't delete account ${name}`, body: err.message })
+        commit('notifyError', { title: `Couldn't delete account ${name}`, body: err.message })
       }
     },
-    async signIn ({ state, dispatch }, {password, account = KEY_NAME}) {
+    async signIn ({ state, dispatch }, { password, account }) {
       state.password = password
       state.account = account
       state.signedIn = true
diff --git a/app/src/renderer/vuex/modules/wallet.js b/app/src/renderer/vuex/modules/wallet.js
index 4f2302249c..0ce3dc7712 100644
--- a/app/src/renderer/vuex/modules/wallet.js
+++ b/app/src/renderer/vuex/modules/wallet.js
@@ -2,10 +2,6 @@ let fs = require('fs-extra')
 let { join } = require('path')
 let root = require('../../../root.js')
 
-export const KEY_NAME = 'default'
-// TODO: add UI for password, instead of hardcoding one
-export const KEY_PASSWORD = '1234567890'
-
 export default ({ commit, node }) => {
   let state = {
     balances: [],
@@ -23,9 +19,12 @@ export default ({ commit, node }) => {
     },
     setWalletKey (state, key) {
       state.key = key
+      // clear previous account state
+      state.balances = []
+      state.history = []
+      state.sequence = 0
     },
     setWalletSequence (state, sequence) {
-      if (state.sequence === sequence) return
       state.sequence = sequence
     },
     setWalletHistory (state, history) {
diff --git a/test/unit/specs/NISessionSignIn.spec.js b/test/unit/specs/NISessionSignIn.spec.js
index 93b827371f..b6f4da4097 100644
--- a/test/unit/specs/NISessionSignIn.spec.js
+++ b/test/unit/specs/NISessionSignIn.spec.js
@@ -17,6 +17,9 @@ describe('NiSessionSignIn', () => {
     store = new Vuex.Store({
       modules: {
         user
+      },
+      getters: {
+        user: () => user.state
       }
     })
     wrapper = mount(NiSessionSignIn, {
@@ -31,19 +34,15 @@ describe('NiSessionSignIn', () => {
     expect(htmlBeautify(wrapper.html())).toMatchSnapshot()
   })
 
-  it('should open the help model on click', () => {
-    wrapper.findAll('.ni-session-header a').at(0).trigger('click')
+  it('should open the help modal on click', () => {
+    wrapper.findAll('.ni-session-header a').at(1).trigger('click')
     expect(store.commit).toHaveBeenCalledWith('setModalHelp', true)
   })
 
-  it('should go to account removal screen', () => {
-    wrapper.find('.ni-session-main a').trigger('click')
-    expect(store.commit).toHaveBeenCalledWith('setModalSessionState', 'delete')
-  })
-
   it('should close the modal on successful login', async () => {
     wrapper.setData({ fields: {
-      signInPassword: '1234567890'
+      signInPassword: '1234567890',
+      signInName: 'name'
     }})
     await wrapper.vm.onSubmit()
     let calls = store.commit.mock.calls.map(args => args[0])
@@ -52,12 +51,16 @@ describe('NiSessionSignIn', () => {
 
   it('should signal signedin state on successful login', async () => {
     wrapper.setData({ fields: {
-      signInPassword: '1234567890'
+      signInPassword: '1234567890',
+      signInName: 'name'
     }})
     await wrapper.vm.onSubmit()
     let commitCalls = store.commit.mock.calls.map(args => args[0])
     expect(commitCalls).toContain('notify')
-    expect(store.dispatch).toHaveBeenCalledWith('signIn', {password: '1234567890'})
+    expect(store.dispatch).toHaveBeenCalledWith('signIn', {
+      password: '1234567890',
+      account: 'name'
+    })
   })
 
   it('should show error if password not 10 long', () => {
@@ -70,9 +73,10 @@ describe('NiSessionSignIn', () => {
   })
 
   it('should show a notification if signin failed', async () => {
-    store.dispatch = jest.fn(() => Promise.reject('Planed rejection'))
+    store.dispatch = jest.fn(() => Promise.reject('Planned rejection'))
     wrapper.setData({ fields: {
-      signInPassword: '1234567890'
+      signInPassword: '1234567890',
+      signInName: 'name'
     }})
     await wrapper.vm.onSubmit()
     expect(store.commit).toHaveBeenCalled()
diff --git a/test/unit/specs/NISessionSignUp.spec.js b/test/unit/specs/NISessionSignUp.spec.js
index b17278cbad..2c5e4dbed1 100644
--- a/test/unit/specs/NISessionSignUp.spec.js
+++ b/test/unit/specs/NISessionSignUp.spec.js
@@ -51,8 +51,9 @@ describe('NISessionSignUp', () => {
 
   it('should close the modal on successful login', async () => {
     wrapper.setData({ fields: {
-      signInPassword: '1234567890',
-      signInSeed: 'bar', // <-- doesn#t check for correctness of seed
+      signUpPassword: '1234567890',
+      signUpSeed: 'bar', // <-- doesn#t check for correctness of seed
+      signUpName: 'testaccount',
       signUpWarning: true,
       signUpBackup: true
     }})
@@ -62,21 +63,26 @@ describe('NISessionSignUp', () => {
 
   it('should signal signedin state on successful login', async () => {
     wrapper.setData({ fields: {
-      signInPassword: '1234567890',
-      signInSeed: 'bar', // <-- doesn#t check for correctness of seed
+      signUpPassword: '1234567890',
+      signUpSeed: 'bar', // <-- doesn#t check for correctness of seed
+      signUpName: 'testaccount',
       signUpWarning: true,
       signUpBackup: true
     }})
     await wrapper.vm.onSubmit()
     expect(store.commit.mock.calls[1][0]).toEqual('notify')
     expect(store.commit.mock.calls[1][1].title.toLowerCase()).toContain('signed up')
-    expect(store.dispatch).toHaveBeenCalledWith('signIn', {password: '1234567890'})
+    expect(store.dispatch).toHaveBeenCalledWith('signIn', {
+      password: '1234567890',
+      account: 'testaccount'
+    })
   })
 
   it('should show error if warnings not acknowledged', () => {
     wrapper.setData({ fields: {
-      signInPassword: '1234567890',
-      signInSeed: 'bar',
+      signUpPassword: '1234567890',
+      signUpSeed: 'bar',
+      signUpName: 'testaccount',
       signUpWarning: false,
       signUpBackup: true
     }})
@@ -87,8 +93,9 @@ describe('NISessionSignUp', () => {
 
   it('should show error if backup info not acknowledged', async () => {
     wrapper.setData({ fields: {
-      signInPassword: '1234567890',
-      signInSeed: 'bar',
+      signUpPassword: '1234567890',
+      signUpSeed: 'bar',
+      signUpName: 'testaccount',
       signUpWarning: true,
       signUpBackup: false
     }})
@@ -99,8 +106,22 @@ describe('NISessionSignUp', () => {
 
   it('should show error if password is not 10 long', async () => {
     wrapper.setData({ fields: {
-      signInPassword: '123456789',
-      signInSeed: 'bar',
+      signUpPassword: '123456789',
+      signUpSeed: 'bar',
+      signUpName: 'testaccount',
+      signUpWarning: true,
+      signUpBackup: true
+    }})
+    await wrapper.vm.onSubmit()
+    expect(store.commit.mock.calls[0]).toBeUndefined()
+    expect(wrapper.find('.ni-form-msg-error')).toBeDefined()
+  })
+
+  it('should show error if account name is not 5 long', async () => {
+    wrapper.setData({ fields: {
+      signUpPassword: '1234567890',
+      signUpSeed: 'bar',
+      signUpName: 'test',
       signUpWarning: true,
       signUpBackup: true
     }})
@@ -112,8 +133,9 @@ describe('NISessionSignUp', () => {
   it('should not continue if creation failed', async () => {
     store.dispatch = jest.fn(() => Promise.resolve(null))
     wrapper.setData({ fields: {
-      signInPassword: '1234567890',
-      signInSeed: 'bar',
+      signUpPassword: '1234567890',
+      signUpSeed: 'bar',
+      signUpName: 'testaccount',
       signUpWarning: true,
       signUpBackup: true
     }})
diff --git a/test/unit/specs/NISessionWelcome.spec.js b/test/unit/specs/NISessionWelcome.spec.js
index dcc73019e8..8fddbf8bfc 100644
--- a/test/unit/specs/NISessionWelcome.spec.js
+++ b/test/unit/specs/NISessionWelcome.spec.js
@@ -9,10 +9,12 @@ localVue.use(Vuex)
 
 describe('NISessionWelcome', () => {
   let wrapper, store, getters
+  let accounts = []
 
   beforeEach(() => {
     getters = {
-      config: () => ({ devMode: true })
+      config: () => ({ devMode: true }),
+      user: () => ({ accounts })
     }
     store = new Vuex.Store({ getters })
     store.commit = jest.fn()
@@ -23,18 +25,41 @@ describe('NISessionWelcome', () => {
     })
   })
 
-  it('has the expected html structure', () => {
-    expect(htmlBeautify(wrapper.html())).toMatchSnapshot()
-  })
+  describe('without accounts', () => {
+    it('should open the help model on click', () => {
+      wrapper.findAll('.ni-session-header a').at(1).trigger('click')
+      expect(store.commit.mock.calls[0]).toEqual(['setModalHelp', true])
+    })
+
+    it('should not show sign-in link since we have no accounts', () => {
+      wrapper.find(LiSession).trigger('click')
+      expect(store.commit.mock.calls[0][1]).not.toEqual('sign-in')
+    })
 
-  it('should open the help model on click', () => {
-    wrapper.findAll('.ni-session-header a').at(1).trigger('click')
-    expect(store.commit.mock.calls[0]).toEqual(['setModalHelp', true])
+    it('has the expected html structure', () => {
+      expect(htmlBeautify(wrapper.html())).toMatchSnapshot()
+    })
   })
 
-  it('sets desired login method', () => {
-    wrapper.findAll(LiSession).trigger('click')
-    expect(store.commit.mock.calls[0][0]).toBe('setModalSessionState')
-    expect(store.commit.mock.calls.map(args => args[1])).toEqual(['sign-up', 'restore', 'hardware'])
+  describe('with accounts', () => {
+    beforeAll(() => {
+      accounts.push('foo', 'bar')
+      wrapper.update()
+    })
+
+    it('should show sign-in link since we have accounts', () => {
+      wrapper.find(LiSession).trigger('click')
+      expect(store.commit.mock.calls[0][1]).toEqual('sign-in')
+    })
+
+    it('sets desired login method', () => {
+      wrapper.findAll(LiSession).trigger('click')
+      expect(store.commit.mock.calls[0][0]).toBe('setModalSessionState')
+      expect(store.commit.mock.calls.map(args => args[1])).toEqual(['sign-in', 'sign-up', 'restore', 'hardware'])
+    })
+
+    it('has the expected html structure', () => {
+      expect(htmlBeautify(wrapper.html())).toMatchSnapshot()
+    })
   })
 })
diff --git a/test/unit/specs/__snapshots__/NISessionSignIn.spec.js.snap b/test/unit/specs/__snapshots__/NISessionSignIn.spec.js.snap
index a767f595ec..b1c8524a6f 100644
--- a/test/unit/specs/__snapshots__/NISessionSignIn.spec.js.snap
+++ b/test/unit/specs/__snapshots__/NISessionSignIn.spec.js.snap
@@ -7,6 +7,7 @@ exports[`NiSessionSignIn has the expected html structure 1`] = `
          <!---->
          <main class=\\"ni-form-main\\">
             <div class=\\"ni-session-header\\">
+               <a><i class=\\"material-icons\\">arrow_back</i></a>
                <div class=\\"ni-session-title\\">
                   Sign In
                </div>
@@ -14,20 +15,277 @@ exports[`NiSessionSignIn has the expected html structure 1`] = `
    </div>
       <div class=\\"ni-session-main\\">
          <div class=\\"ni-form-group\\">
-            <label for=\\"sign-in-password\\">Password</label>
+            <label for=\\"sign-in-name\\">Select Account</label>
             <div class=\\"ni-form-group-field\\">
-               <input type=\\"password\\" class=\\"ni-field\\" id=\\"sign-in-password\\">
-               <div class=\\"ni-form-msg ni-form-msg-error\\">
-                  Password is required
-               </div>
-                  <!---->
-   </div>
+               <div class=\\"ni-select\\" id=\\"sign-in-name\\">
+                  <select class=\\"ni-field ni-field-select\\">
+                  <option value=\\"\\" disabled=\\"disabled\\" selected=\\"selected\\" hidden=\\"hidden\\">
+                     Select option...
+                  </option>
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                     <!---->
+                  </select>
+                  <div class=\\"ni-field-select-addon\\">
+                     <i class=\\"material-icons\\">arrow_drop_down</i>
+                  </div>
+</div>
+      <div class=\\"ni-form-msg ni-form-msg-error\\">
+         Name is required
+      </div>
+</div>
 </div>
       <div class=\\"ni-form-group\\">
-         <!---->
+         <label for=\\"sign-in-password\\">Password</label>
          <div class=\\"ni-form-group-field\\">
-            <a>Sign Out and Remove Account</a>
-         </div>
+            <input type=\\"password\\" class=\\"ni-field\\" id=\\"sign-in-password\\">
+            <div class=\\"ni-form-msg ni-form-msg-error\\">
+               Password is required
+            </div>
+               <!---->
+   </div>
 </div>
 </div>
       <div class=\\"ni-session-footer\\">
diff --git a/test/unit/specs/__snapshots__/NISessionSignUp.spec.js.snap b/test/unit/specs/__snapshots__/NISessionSignUp.spec.js.snap
index 0a247467b8..bbfce72d8e 100644
--- a/test/unit/specs/__snapshots__/NISessionSignUp.spec.js.snap
+++ b/test/unit/specs/__snapshots__/NISessionSignUp.spec.js.snap
@@ -15,12 +15,22 @@ exports[`NISessionSignUp has the expected html structure 1`] = `
    </div>
       <div class=\\"ni-session-main\\">
          <div class=\\"ni-form-group\\">
-            <label for=\\"sign-up-seed\\">Seed (write it down)</label>
+            <label for=\\"sign-up-name\\">Account Name</label>
             <div class=\\"ni-form-group-field\\">
-               <textarea class=\\"ni-field-seed ni-field\\" id=\\"sign-up-seed\\" disabled=\\"disabled\\"></textarea>
-               <div class=\\"ni-form-msg ni-form-msg-desc\\">
-                  Please back up the seed phrase for this account. These words cannot be recovered!
+               <input type=\\"text\\" placeholder=\\"at least 5 characters\\" class=\\"ni-field\\" id=\\"sign-up-name\\">
+               <div class=\\"ni-form-msg ni-form-msg-error\\">
+                  Name is required
                </div>
+                  <!---->
+   </div>
+</div>
+      <div class=\\"ni-form-group\\">
+         <label for=\\"sign-up-seed\\">Seed (write it down)</label>
+         <div class=\\"ni-form-group-field\\">
+            <textarea class=\\"ni-field-seed ni-field\\" id=\\"sign-up-seed\\" disabled=\\"disabled\\"></textarea>
+            <div class=\\"ni-form-msg ni-form-msg-desc\\">
+               Please back up the seed phrase for this account. These words cannot be recovered!
+            </div>
 </div>
 </div>
       <div class=\\"ni-form-group\\">
diff --git a/test/unit/specs/__snapshots__/NISessionWelcome.spec.js.snap b/test/unit/specs/__snapshots__/NISessionWelcome.spec.js.snap
index cdd47bc6b8..6abd0a537a 100644
--- a/test/unit/specs/__snapshots__/NISessionWelcome.spec.js.snap
+++ b/test/unit/specs/__snapshots__/NISessionWelcome.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`NISessionWelcome has the expected html structure 1`] = `
+exports[`NISessionWelcome with accounts has the expected html structure 1`] = `
 "<div class=\\"ni-session\\">
    <div class=\\"ni-session-container\\">
       <div class=\\"ni-session-header\\">
@@ -11,6 +11,76 @@ exports[`NISessionWelcome has the expected html structure 1`] = `
 <a><i class=\\"material-icons\\">help_outline</i></a>
 </div>
 <div class=\\"ni-session-main\\">
+   <div class=\\"ni-li-session\\">
+      <div class=\\"ni-li-session-icon\\">
+         <i class=\\"material-icons\\">lock</i>
+      </div>
+<div class=\\"ni-li-session-text\\">
+   <div class=\\"ni-li-session-title\\">
+      Sign in with password
+   </div>
+<div class=\\"ni-li-session-subtitle\\">
+   If you have an account, choose this option
+</div>
+</div>
+</div>
+<div class=\\"ni-li-session\\">
+   <div class=\\"ni-li-session-icon\\">
+      <i class=\\"material-icons\\">create</i>
+   </div>
+<div class=\\"ni-li-session-text\\">
+   <div class=\\"ni-li-session-title\\">
+      Create new account
+   </div>
+<div class=\\"ni-li-session-subtitle\\">
+   Generate a brand new seed and account
+</div>
+</div>
+</div>
+<div class=\\"ni-li-session\\">
+   <div class=\\"ni-li-session-icon\\">
+      <i class=\\"material-icons\\">settings_backup_restore</i>
+   </div>
+<div class=\\"ni-li-session-text\\">
+   <div class=\\"ni-li-session-title\\">
+      Restore account from seed
+   </div>
+<div class=\\"ni-li-session-subtitle\\">
+   If you have a seed, choose this option
+</div>
+</div>
+</div>
+<div class=\\"ni-li-session\\">
+   <div class=\\"ni-li-session-icon\\">
+      <i class=\\"material-icons\\">usb</i>
+   </div>
+<div class=\\"ni-li-session-text\\">
+   <div class=\\"ni-li-session-title\\">
+      Sign in with hardware
+   </div>
+<div class=\\"ni-li-session-subtitle\\">
+   If you have a Ledger Wallet, choose this option
+</div>
+</div>
+</div>
+</div>
+<div class=\\"ni-session-footer\\"></div>
+</div>
+</div>"
+`;
+
+exports[`NISessionWelcome without accounts has the expected html structure 1`] = `
+"<div class=\\"ni-session\\">
+   <div class=\\"ni-session-container\\">
+      <div class=\\"ni-session-header\\">
+         <a>&nbsp;</a>
+         <div class=\\"ni-session-title\\">
+            Welcome to Cosmos!
+         </div>
+<a><i class=\\"material-icons\\">help_outline</i></a>
+</div>
+<div class=\\"ni-session-main\\">
+   <!---->
    <div class=\\"ni-li-session\\">
       <div class=\\"ni-li-session-icon\\">
          <i class=\\"material-icons\\">create</i>