diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/modals/EditMeta/editMeta.js
index aea7a7060..8b5e14939 100644
--- a/js/src/modals/EditMeta/editMeta.js
+++ b/js/src/modals/EditMeta/editMeta.js
@@ -85,7 +85,7 @@ export default class EditMeta extends Component {
                 defaultMessage='(optional) tags' />
             }
             onTokensChange={ this.store.setTags }
-            tokens={ tags } />
+            tokens={ tags.slice() } />
         </Form>
       </Modal>
     );
diff --git a/js/src/modals/EditMeta/editMeta.spec.js b/js/src/modals/EditMeta/editMeta.spec.js
index b490fcdaf..917f32076 100644
--- a/js/src/modals/EditMeta/editMeta.spec.js
+++ b/js/src/modals/EditMeta/editMeta.spec.js
@@ -20,7 +20,7 @@ import sinon from 'sinon';
 
 import EditMeta from './';
 
-import { ACCOUNT } from './editMeta.test.js';
+import { ACCOUNT, createApi } from './editMeta.test.js';
 
 let component;
 let onClose;
@@ -35,12 +35,7 @@ function render (props) {
       onClose={ onClose } />,
     {
       context: {
-        api: {
-          parity: {
-            setAccountName: sinon.stub().resolves(),
-            setAccountMeta: sinon.stub().resolves()
-          }
-        }
+        api: createApi()
       }
     }
   );
diff --git a/js/src/modals/EditMeta/editMeta.test.js b/js/src/modals/EditMeta/editMeta.test.js
index 7f359a405..98bd61fea 100644
--- a/js/src/modals/EditMeta/editMeta.test.js
+++ b/js/src/modals/EditMeta/editMeta.test.js
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import sinon from 'sinon';
+
 const ACCOUNT = {
   address: '0x123456789a123456789a123456789a123456789a',
   meta: {
@@ -39,7 +41,17 @@ const ADDRESS = {
   name: 'Random address'
 };
 
+function createApi () {
+  return {
+    parity: {
+      setAccountName: sinon.stub().resolves(),
+      setAccountMeta: sinon.stub().resolves()
+    }
+  };
+}
+
 export {
   ACCOUNT,
-  ADDRESS
+  ADDRESS,
+  createApi
 };
diff --git a/js/src/modals/EditMeta/store.js b/js/src/modals/EditMeta/store.js
index 3f0355e84..b2d71c63a 100644
--- a/js/src/modals/EditMeta/store.js
+++ b/js/src/modals/EditMeta/store.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { action, computed, observable, toJS, transaction } from 'mobx';
+import { action, computed, observable, transaction } from 'mobx';
 
 import { newError } from '~/redux/actions';
 import { validateName } from '~/util/validation';
@@ -23,25 +23,27 @@ export default class Store {
   @observable address = null;
   @observable isAccount = false;
   @observable description = null;
-  @observable meta = {};
+  @observable meta = null;
   @observable name = null;
   @observable nameError = null;
   @observable passwordHint = null;
-  @observable tags = [];
+  @observable tags = null;
 
   constructor (api, account) {
     const { address, name, meta, uuid } = account;
 
     this._api = api;
 
-    this.isAccount = !!uuid;
-    this.address = address;
-    this.meta = Object.assign({}, meta || {});
-    this.name = name || '';
+    transaction(() => {
+      this.isAccount = !!uuid;
+      this.address = address;
+      this.meta = meta || {};
+      this.name = name || '';
 
-    this.description = this.meta.description || '';
-    this.passwordHint = this.meta.passwordHint || '';
-    this.tags = [].concat((meta || {}).tags || []);
+      this.description = this.meta.description || '';
+      this.passwordHint = this.meta.passwordHint || '';
+      this.tags = this.meta.tags && this.meta.tags.peek() || [];
+    });
   }
 
   @computed get hasError () {
@@ -70,7 +72,7 @@ export default class Store {
   }
 
   @action setTags = (tags) => {
-    this.tags = [].concat(tags);
+    this.tags = tags.slice();
   }
 
   save () {
@@ -86,7 +88,7 @@ export default class Store {
     return Promise
       .all([
         this._api.parity.setAccountName(this.address, this.name),
-        this._api.parity.setAccountMeta(this.address, Object.assign({}, toJS(this.meta), meta))
+        this._api.parity.setAccountMeta(this.address, Object.assign({}, this.meta, meta))
       ])
       .catch((error) => {
         console.error('onSave', error);
diff --git a/js/src/modals/EditMeta/store.spec.js b/js/src/modals/EditMeta/store.spec.js
index e69656e96..c707d1f6c 100644
--- a/js/src/modals/EditMeta/store.spec.js
+++ b/js/src/modals/EditMeta/store.spec.js
@@ -14,22 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { toJS } from 'mobx';
-import sinon from 'sinon';
-
 import Store from './store';
-import { ACCOUNT, ADDRESS } from './editMeta.test.js';
+import { ACCOUNT, ADDRESS, createApi } from './editMeta.test.js';
 
 let api;
 let store;
 
 function createStore (account) {
-  api = {
-    parity: {
-      setAccountName: sinon.stub().resolves(),
-      setAccountMeta: sinon.stub().resolves()
-    }
-  };
+  api = createApi();
 
   store = new Store(api, account);
 
@@ -56,12 +48,12 @@ describe('modals/EditMeta/Store', () => {
       });
 
       it('extracts the tags', () => {
-        expect(store.tags.peek()).to.deep.equal(ACCOUNT.meta.tags);
+        expect(store.tags).to.deep.equal(ACCOUNT.meta.tags);
       });
 
       describe('meta', () => {
         it('extracts the full meta', () => {
-          expect(toJS(store.meta)).to.deep.equal(ACCOUNT.meta);
+          expect(store.meta).to.deep.equal(ACCOUNT.meta);
         });
 
         it('extracts the description', () => {
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
index 8121e14d2..0f7a08f27 100644
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ b/js/src/modals/PasswordManager/passwordManager.js
@@ -14,54 +14,55 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { Component, PropTypes } from 'react';
-import ContentClear from 'material-ui/svg-icons/content/clear';
-import CheckIcon from 'material-ui/svg-icons/navigation/check';
-import SendIcon from 'material-ui/svg-icons/content/send';
-
-import { Tabs, Tab } from 'material-ui/Tabs';
 import Paper from 'material-ui/Paper';
+import { Tabs, Tab } from 'material-ui/Tabs';
+import { observer } from 'mobx-react';
+import React, { Component, PropTypes } from 'react';
+import { FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { showSnackbar } from '~/redux/providers/snackbarActions';
-
-import Form, { Input } from '~/ui/Form';
+import { newError, showSnackbar } from '~/redux/actions';
 import { Button, Modal, IdentityName, IdentityIcon } from '~/ui';
+import Form, { Input } from '~/ui/Form';
+import { CancelIcon, CheckIcon, SendIcon } from '~/ui/Icons';
 
+import Store, { CHANGE_ACTION, TEST_ACTION } from './store';
 import styles from './passwordManager.css';
 
-const TEST_ACTION = 'TEST_ACTION';
-const CHANGE_ACTION = 'CHANGE_ACTION';
+const MSG_SUCCESS_STYLE = {
+  backgroundColor: 'rgba(174, 213, 129, 0.75)'
+};
+const MSG_FAILURE_STYLE = {
+  backgroundColor: 'rgba(229, 115, 115, 0.75)'
+};
+const TABS_INKBAR_STYLE = {
+  backgroundColor: 'rgba(255, 255, 255, 0.55)'
+};
+const TABS_ITEM_STYLE = {
+  backgroundColor: 'rgba(255, 255, 255, 0.05)'
+};
 
-class PasswordManager extends Component {
+@observer
+export default class PasswordManager extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
   }
 
   static propTypes = {
     account: PropTypes.object.isRequired,
-    showSnackbar: PropTypes.func.isRequired,
     onClose: PropTypes.func
   }
 
-  state = {
-    action: TEST_ACTION,
-    waiting: false,
-    showMessage: false,
-    message: { value: '', success: true },
-    currentPass: '',
-    newPass: '',
-    repeatNewPass: '',
-    repeatValid: true,
-    passwordHint: this.props.account.meta && this.props.account.meta.passwordHint || ''
-  }
+  store = new Store(this.context.api, this.props.account);
 
   render () {
     return (
       <Modal
         actions={ this.renderDialogActions() }
-        title='Password Manager'
+        title={
+          <FormattedMessage
+            id='passwordChange.title'
+            defaultMessage='Password Manager' />
+        }
         visible>
         { this.renderAccount() }
         { this.renderPage() }
@@ -71,150 +72,168 @@ class PasswordManager extends Component {
   }
 
   renderMessage () {
-    const { message, showMessage } = this.state;
+    const { infoMessage } = this.store;
 
-    const style = message.success
-      ? {
-        backgroundColor: 'rgba(174, 213, 129, 0.75)'
-      }
-      : {
-        backgroundColor: 'rgba(229, 115, 115, 0.75)'
-      };
-
-    const classes = [ styles.message ];
-
-    if (!showMessage) {
-      classes.push(styles.hideMessage);
+    if (!infoMessage) {
+      return null;
     }
 
     return (
       <Paper
-        zDepth={ 1 }
-        style={ style }
-        className={ classes.join(' ') }>
-        { message.value }
+        className={ `${styles.message}` }
+        style={
+          infoMessage.success
+            ? MSG_SUCCESS_STYLE
+            : MSG_FAILURE_STYLE
+        }
+        zDepth={ 1 }>
+        { infoMessage.value }
       </Paper>
     );
   }
 
   renderAccount () {
-    const { account } = this.props;
-    const { address, meta } = account;
-
-    const passwordHint = meta && meta.passwordHint
-      ? (
-        <span className={ styles.passwordHint }>
-          <span className={ styles.hintLabel }>Hint </span>
-          { meta.passwordHint }
-        </span>
-      )
-      : null;
+    const { address, passwordHint } = this.store;
 
     return (
       <div className={ styles.accountContainer }>
-        <IdentityIcon
-          address={ address }
-        />
+        <IdentityIcon address={ address } />
         <div className={ styles.accountInfos }>
           <IdentityName
-            className={ styles.accountName }
             address={ address }
-            unknown
-          />
+            className={ styles.accountName }
+            unknown />
           <span className={ styles.accountAddress }>
             { address }
           </span>
-          { passwordHint }
+          <span className={ styles.passwordHint }>
+            <span className={ styles.hintLabel }>Hint </span>
+            { passwordHint || '-' }
+          </span>
         </div>
       </div>
     );
   }
 
   renderPage () {
-    const { account } = this.props;
-    const { waiting, repeatValid } = this.state;
-    const disabled = !!waiting;
-
-    const repeatError = repeatValid
-      ? null
-      : 'the two passwords differ';
-
-    const { meta } = account;
-    const passwordHint = meta && meta.passwordHint || '';
+    const { busy, isRepeatValid, passwordHint } = this.store;
 
     return (
       <Tabs
-        inkBarStyle={ {
-          backgroundColor: 'rgba(255, 255, 255, 0.55)'
-        } }
-        tabItemContainerStyle={ {
-          backgroundColor: 'rgba(255, 255, 255, 0.05)'
-        } }
-      >
+        inkBarStyle={ TABS_INKBAR_STYLE }
+        tabItemContainerStyle={ TABS_ITEM_STYLE }>
         <Tab
-          onActive={ this.handleTestActive }
-          label='Test Password'
-        >
-          <Form
-            className={ styles.form }
-          >
+          label={
+            <FormattedMessage
+              id='passwordChange.tabTest.label'
+              defaultMessage='Test Password' />
+          }
+          onActive={ this.onActivateTestTab }>
+          <Form className={ styles.form }>
             <div>
               <Input
-                label='password'
-                hint='your current password for this account'
-                type='password'
+                disabled={ busy }
+                hint={
+                  <FormattedMessage
+                    id='passwordChange.testPassword.hint'
+                    defaultMessage='your account password' />
+                }
+                label={
+                  <FormattedMessage
+                    id='passwordChange.testPassword.label'
+                    defaultMessage='password' />
+                }
+                onChange={ this.onEditTestPassword }
+                onSubmit={ this.testPassword }
                 submitOnBlur={ false }
-                disabled={ disabled }
-                onSubmit={ this.handleTestPassword }
-                onChange={ this.onEditCurrent } />
+                type='password' />
             </div>
           </Form>
         </Tab>
         <Tab
-          onActive={ this.handleChangeActive }
-          label='Change Password'
-        >
-          <Form
-            className={ styles.form }
-          >
+          label={
+            <FormattedMessage
+              id='passwordChange.tabChange.label'
+              defaultMessage='Change Password' />
+          }
+          onActive={ this.onActivateChangeTab }>
+          <Form className={ styles.form }>
             <div>
               <Input
-                label='current password'
-                hint='your current password for this account'
-                type='password'
+                disabled={ busy }
+                hint={
+                  <FormattedMessage
+                    id='passwordChange.currentPassword.hint'
+                    defaultMessage='your current password for this account' />
+                }
+                label={
+                  <FormattedMessage
+                    id='passwordChange.currentPassword.label'
+                    defaultMessage='current password' />
+                }
+                onChange={ this.onEditCurrentPassword }
+                onSubmit={ this.changePassword }
                 submitOnBlur={ false }
-                disabled={ disabled }
-                onSubmit={ this.handleChangePassword }
-                onChange={ this.onEditCurrent } />
+                type='password' />
               <Input
-                label='(optional) new password hint'
-                hint='hint for the new password'
+                disabled={ busy }
+                hint={
+                  <FormattedMessage
+                    id='passwordChange.passwordHint.hint'
+                    defaultMessage='hint for the new password' />
+                }
+                label={
+                  <FormattedMessage
+                    id='passwordChange.passwordHint.label'
+                    defaultMessage='(optional) new password hint' />
+                }
+                onChange={ this.onEditNewPasswordHint }
+                onSubmit={ this.changePassword }
                 submitOnBlur={ false }
-                value={ passwordHint }
-                disabled={ disabled }
-                onSubmit={ this.handleChangePassword }
-                onChange={ this.onEditHint } />
+                value={ passwordHint } />
               <div className={ styles.passwords }>
                 <div className={ styles.password }>
                   <Input
-                    label='new password'
-                    hint='the new password for this account'
-                    type='password'
+                    disabled={ busy }
+                    hint={
+                      <FormattedMessage
+                        id='passwordChange.newPassword.hint'
+                        defaultMessage='the new password for this account' />
+                    }
+                    label={
+                      <FormattedMessage
+                        id='passwordChange.newPassword.label'
+                        defaultMessage='new password' />
+                    }
+                    onChange={ this.onEditNewPassword }
+                    onSubmit={ this.changePassword }
                     submitOnBlur={ false }
-                    disabled={ disabled }
-                    onSubmit={ this.handleChangePassword }
-                    onChange={ this.onEditNew } />
+                    type='password' />
                 </div>
                 <div className={ styles.password }>
                   <Input
-                    label='repeat new password'
-                    hint='repeat the new password for this account'
-                    type='password'
+                    disabled={ busy }
+                    error={
+                      isRepeatValid
+                        ? null
+                        : <FormattedMessage
+                          id='passwordChange.repeatPassword.error'
+                          defaultMessage='the supplied passwords do not match' />
+                    }
+                    hint={
+                      <FormattedMessage
+                        id='passwordChange.repeatPassword.hint'
+                        defaultMessage='repeat the new password for this account' />
+                    }
+                    label={
+                      <FormattedMessage
+                        id='passwordChange.repeatPassword.label'
+                        defaultMessage='repeat new password' />
+                    }
+                    onChange={ this.onEditNewPasswordRepeat }
+                    onSubmit={ this.changePassword }
                     submitOnBlur={ false }
-                    error={ repeatError }
-                    disabled={ disabled }
-                    onSubmit={ this.handleChangePassword }
-                    onChange={ this.onEditRepeatNew } />
+                    type='password' />
                 </div>
               </div>
             </div>
@@ -225,176 +244,118 @@ class PasswordManager extends Component {
   }
 
   renderDialogActions () {
+    const { actionTab, busy, isRepeatValid } = this.store;
     const { onClose } = this.props;
-    const { action, waiting, repeatValid } = this.state;
 
     const cancelBtn = (
       <Button
-        icon={ <ContentClear /> }
-        label='Cancel'
+        icon={ <CancelIcon /> }
+        key='cancel'
+        label={
+          <FormattedMessage
+            id='passwordChange.button.cancel'
+            defaultMessage='Cancel' />
+        }
         onClick={ onClose } />
     );
 
-    if (waiting) {
-      const waitingBtn = (
+    if (busy) {
+      return [
+        cancelBtn,
         <Button
           disabled
-          label='Wait...' />
-      );
-
-      return [ cancelBtn, waitingBtn ];
+          key='wait'
+          label={
+            <FormattedMessage
+              id='passwordChange.button.wait'
+              defaultMessage='Wait...' />
+          } />
+      ];
     }
 
-    if (action === TEST_ACTION) {
-      const testBtn = (
+    if (actionTab === TEST_ACTION) {
+      return [
+        cancelBtn,
         <Button
           icon={ <CheckIcon /> }
-          label='Test'
-          onClick={ this.handleTestPassword } />
-      );
-
-      return [ cancelBtn, testBtn ];
+          key='test'
+          label={
+            <FormattedMessage
+              id='passwordChange.button.test'
+              defaultMessage='Test' />
+          }
+          onClick={ this.testPassword } />
+      ];
     }
 
-    const changeBtn = (
+    return [
+      cancelBtn,
       <Button
-        disabled={ !repeatValid }
+        disabled={ !isRepeatValid }
         icon={ <SendIcon /> }
-        label='Change'
-        onClick={ this.handleChangePassword } />
-    );
-
-    return [ cancelBtn, changeBtn ];
-  }
-
-  onEditCurrent = (event, value) => {
-    this.setState({
-      currentPass: value,
-      showMessage: false
-    });
-  }
-
-  onEditNew = (event, value) => {
-    const repeatValid = value === this.state.repeatNewPass;
-
-    this.setState({
-      newPass: value,
-      showMessage: false,
-      repeatValid
-    });
-  }
-
-  onEditRepeatNew = (event, value) => {
-    const repeatValid = value === this.state.newPass;
-
-    this.setState({
-      repeatNewPass: value,
-      showMessage: false,
-      repeatValid
-    });
-  }
-
-  onEditHint = (event, value) => {
-    this.setState({
-      passwordHint: value,
-      showMessage: false
-    });
-  }
-
-  handleTestActive = () => {
-    this.setState({
-      action: TEST_ACTION,
-      showMessage: false
-    });
-  }
-
-  handleChangeActive = () => {
-    this.setState({
-      action: CHANGE_ACTION,
-      showMessage: false
-    });
-  }
-
-  handleTestPassword = () => {
-    const { account } = this.props;
-    const { currentPass } = this.state;
-
-    this.setState({ waiting: true, showMessage: false });
-
-    this.context
-      .api.parity
-      .testPassword(account.address, currentPass)
-      .then(correct => {
-        const message = correct
-          ? { value: 'This password is correct', success: true }
-          : { value: 'This password is not correct', success: false };
-
-        this.setState({ waiting: false, message, showMessage: true });
-      })
-      .catch(e => {
-        console.error('passwordManager::handleTestPassword', e);
-        this.setState({ waiting: false });
-      });
-  }
-
-  handleChangePassword = () => {
-    const { account, showSnackbar, onClose } = this.props;
-    const { currentPass, newPass, repeatNewPass, passwordHint } = this.state;
-
-    if (repeatNewPass !== newPass) {
-      return;
-    }
-
-    this.setState({ waiting: true, showMessage: false });
-
-    this.context
-      .api.parity
-      .testPassword(account.address, currentPass)
-      .then(correct => {
-        if (!correct) {
-          const message = {
-            value: 'This provided current password is not correct',
-            success: false
-          };
-
-          this.setState({ waiting: false, message, showMessage: true });
-
-          return false;
+        key='change'
+        label={
+          <FormattedMessage
+            id='passwordChange.button.change'
+            defaultMessage='Change' />
         }
+        onClick={ this.changePassword } />
+    ];
+  }
 
-        const meta = Object.assign({}, account.meta, {
-          passwordHint
-        });
+  onActivateChangeTab = () => {
+    this.store.setActionTab(CHANGE_ACTION);
+  }
 
-        return Promise.all([
-          this.context
-            .api.parity
-            .setAccountMeta(account.address, meta),
+  onActivateTestTab = () => {
+    this.store.setActionTab(TEST_ACTION);
+  }
 
-          this.context
-            .api.parity
-            .changePassword(account.address, currentPass, newPass)
-        ])
-          .then(() => {
-            showSnackbar(<div>Your password has been successfully changed.</div>);
-            this.setState({ waiting: false, showMessage: false });
-            onClose();
-          });
+  onEditCurrentPassword = (event, password) => {
+    this.store.setPassword(password);
+  }
+
+  onEditNewPassword = (event, password) => {
+    this.store.setNewPassword(password);
+  }
+
+  onEditNewPasswordHint = (event, passwordHint) => {
+    this.store.setNewPasswordHint(passwordHint);
+  }
+
+  onEditNewPasswordRepeat = (event, password) => {
+    this.store.setNewPasswordRepeat(password);
+  }
+
+  onEditTestPassword = (event, password) => {
+    this.store.setValidatePassword(password);
+  }
+
+  changePassword = () => {
+    return this.store
+      .changePassword()
+      .then((result) => {
+        if (result) {
+          showSnackbar(
+            <div>
+              <FormattedMessage
+                id='passwordChange.success'
+                defaultMessage='Your password has been successfully changed' />
+            </div>
+          );
+          this.props.onClose();
+        }
       })
-      .catch(e => {
-        console.error('passwordManager::handleChangePassword', e);
-        this.setState({ waiting: false });
+      .catch((error) => {
+        newError(error);
+      });
+  }
+
+  testPassword = () => {
+    return this.store
+      .testPassword()
+      .catch((error) => {
+        newError(error);
       });
   }
 }
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    showSnackbar
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(PasswordManager);
diff --git a/js/src/modals/PasswordManager/passwordManager.spec.js b/js/src/modals/PasswordManager/passwordManager.spec.js
new file mode 100644
index 000000000..744d0ffa3
--- /dev/null
+++ b/js/src/modals/PasswordManager/passwordManager.spec.js
@@ -0,0 +1,81 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import sinon from 'sinon';
+
+import PasswordManager from './';
+
+import { ACCOUNT, createApi } from './passwordManager.test.js';
+
+let component;
+let onClose;
+
+function render (props) {
+  onClose = sinon.stub();
+
+  component = shallow(
+    <PasswordManager
+      { ...props }
+      account={ ACCOUNT }
+      onClose={ onClose } />,
+    {
+      context: {
+        api: createApi()
+      }
+    }
+  );
+
+  return component;
+}
+
+describe('modals/PasswordManager', () => {
+  describe('rendering', () => {
+    it('renders defaults', () => {
+      expect(render()).to.be.ok;
+    });
+  });
+
+  describe('actions', () => {
+    beforeEach(() => {
+      render();
+    });
+
+    describe('changePassword', () => {
+      it('calls store.changePassword & props.onClose', () => {
+        const instance = component.instance();
+        sinon.spy(instance.store, 'changePassword');
+
+        instance.changePassword().then(() => {
+          expect(instance.store.changePassword).to.have.been.called;
+          expect(onClose).to.have.been.called;
+        });
+      });
+    });
+
+    describe('testPassword', () => {
+      it('calls store.testPassword', () => {
+        const instance = component.instance();
+        sinon.spy(instance.store, 'testPassword');
+
+        instance.testPassword().then(() => {
+          expect(instance.store.testPassword).to.have.been.called;
+        });
+      });
+    });
+  });
+});
diff --git a/js/src/modals/PasswordManager/passwordManager.test.js b/js/src/modals/PasswordManager/passwordManager.test.js
new file mode 100644
index 000000000..9a8f883ec
--- /dev/null
+++ b/js/src/modals/PasswordManager/passwordManager.test.js
@@ -0,0 +1,43 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import sinon from 'sinon';
+
+const ACCOUNT = {
+  address: '0x123456789a123456789a123456789a123456789a',
+  meta: {
+    description: 'Call me bob',
+    passwordHint: 'some hint',
+    tags: ['testing']
+  },
+  name: 'Bobby',
+  uuid: '123-456'
+};
+
+function createApi (result = true) {
+  return {
+    parity: {
+      changePassword: sinon.stub().resolves(result),
+      setAccountMeta: sinon.stub().resolves(result),
+      testPassword: sinon.stub().resolves(result)
+    }
+  };
+}
+
+export {
+  ACCOUNT,
+  createApi
+};
diff --git a/js/src/modals/PasswordManager/store.js b/js/src/modals/PasswordManager/store.js
new file mode 100644
index 000000000..c60576e0f
--- /dev/null
+++ b/js/src/modals/PasswordManager/store.js
@@ -0,0 +1,161 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { action, computed, observable, transaction } from 'mobx';
+
+const CHANGE_ACTION = 'CHANGE_ACTION';
+const TEST_ACTION = 'TEST_ACTION';
+
+export default class Store {
+  @observable actionTab = TEST_ACTION;
+  @observable address = null;
+  @observable busy = false;
+  @observable infoMessage = null;
+  @observable meta = null;
+  @observable newPassword = '';
+  @observable newPasswordHint = '';
+  @observable newPasswordRepeat = '';
+  @observable password = '';
+  @observable passwordHint = '';
+  @observable validatePassword = '';
+
+  constructor (api, account) {
+    this._api = api;
+
+    this.address = account.address;
+    this.meta = account.meta || {};
+    this.passwordHint = this.meta.passwordHint || '';
+  }
+
+  @computed get isRepeatValid () {
+    return this.newPasswordRepeat === this.newPassword;
+  }
+
+  @action setActionTab = (actionTab) => {
+    transaction(() => {
+      this.actionTab = actionTab;
+      this.setInfoMessage();
+    });
+  }
+
+  @action setBusy = (busy, message) => {
+    transaction(() => {
+      this.busy = busy;
+      this.setInfoMessage(message);
+    });
+  }
+
+  @action setInfoMessage = (message = null) => {
+    this.infoMessage = message;
+  }
+
+  @action setPassword = (password) => {
+    transaction(() => {
+      this.password = password;
+      this.setInfoMessage();
+    });
+  }
+
+  @action setNewPassword = (password) => {
+    transaction(() => {
+      this.newPassword = password;
+      this.setInfoMessage();
+    });
+  }
+
+  @action setNewPasswordHint = (passwordHint) => {
+    transaction(() => {
+      this.newPasswordHint = passwordHint;
+      this.setInfoMessage();
+    });
+  }
+
+  @action setNewPasswordRepeat = (password) => {
+    transaction(() => {
+      this.newPasswordRepeat = password;
+      this.setInfoMessage();
+    });
+  }
+
+  @action setValidatePassword = (password) => {
+    transaction(() => {
+      this.validatePassword = password;
+      this.setInfoMessage();
+    });
+  }
+
+  changePassword = () => {
+    if (!this.isRepeatValid) {
+      return Promise.resolve(false);
+    }
+
+    this.setBusy(true);
+
+    return this
+      .testPassword(this.password)
+      .then((result) => {
+        if (!result) {
+          return false;
+        }
+
+        const meta = Object.assign({}, this.meta, {
+          passwordHint: this.newPasswordHint
+        });
+
+        return Promise
+          .all([
+            this._api.parity.setAccountMeta(this.address, meta),
+            this._api.parity.changePassword(this.address, this.password, this.newPassword)
+          ])
+          .then(() => {
+            this.setBusy(false);
+            return true;
+          });
+      })
+      .catch((error) => {
+        console.error('changePassword', error);
+        this.setBusy(false);
+        throw error;
+      });
+  }
+
+  testPassword = (password) => {
+    this.setBusy(false);
+
+    return this._api.parity
+      .testPassword(this.address, password || this.validatePassword)
+      .then((success) => {
+        this.setBusy(false, {
+          success,
+          value: success
+            ? 'This password is correct'
+            : 'This password is not correct'
+        });
+
+        return success;
+      })
+      .catch((error) => {
+        console.error('testPassword', error);
+        this.setBusy(false);
+        throw error;
+      });
+  }
+}
+
+export {
+  CHANGE_ACTION,
+  TEST_ACTION
+};
diff --git a/js/src/modals/PasswordManager/store.spec.js b/js/src/modals/PasswordManager/store.spec.js
new file mode 100644
index 000000000..a7c9642b6
--- /dev/null
+++ b/js/src/modals/PasswordManager/store.spec.js
@@ -0,0 +1,103 @@
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import Store from './store';
+import { ACCOUNT, createApi } from './passwordManager.test.js';
+
+let api;
+let store;
+
+function createStore (account) {
+  api = createApi();
+  store = new Store(api, account);
+
+  return store;
+}
+
+describe('modals/PasswordManager/Store', () => {
+  beforeEach(() => {
+    createStore(ACCOUNT);
+  });
+
+  describe('constructor', () => {
+    it('extracts the address', () => {
+      expect(store.address).to.equal(ACCOUNT.address);
+    });
+
+    describe('meta', () => {
+      it('extracts the full meta', () => {
+        expect(store.meta).to.deep.equal(ACCOUNT.meta);
+      });
+
+      it('extracts the passwordHint', () => {
+        expect(store.passwordHint).to.equal(ACCOUNT.meta.passwordHint);
+      });
+    });
+  });
+
+  describe('operations', () => {
+    const CUR_PASSWORD = 'aPassW0rd';
+    const NEW_PASSWORD = 'br@ndNEW';
+    const NEW_HINT = 'something new to test';
+
+    describe('changePassword', () => {
+      beforeEach(() => {
+        store.setPassword(CUR_PASSWORD);
+        store.setNewPasswordHint(NEW_HINT);
+        store.setNewPassword(NEW_PASSWORD);
+        store.setNewPasswordRepeat(NEW_PASSWORD);
+      });
+
+      it('calls parity.testPassword with current password', () => {
+        return store.changePassword().then(() => {
+          expect(api.parity.testPassword).to.have.been.calledWith(ACCOUNT.address, CUR_PASSWORD);
+        });
+      });
+
+      it('calls parity.setAccountMeta with new hint', () => {
+        return store.changePassword().then(() => {
+          expect(api.parity.setAccountMeta).to.have.been.calledWith(ACCOUNT.address, Object.assign({}, ACCOUNT.meta, {
+            passwordHint: NEW_HINT
+          }));
+        });
+      });
+
+      it('calls parity.changePassword with the new password', () => {
+        return store.changePassword().then(() => {
+          expect(api.parity.changePassword).to.have.been.calledWith(ACCOUNT.address, CUR_PASSWORD, NEW_PASSWORD);
+        });
+      });
+    });
+
+    describe('testPassword', () => {
+      beforeEach(() => {
+        store.setValidatePassword(CUR_PASSWORD);
+      });
+
+      it('calls parity.testPassword', () => {
+        return store.testPassword().then(() => {
+          expect(api.parity.testPassword).to.have.been.calledWith(ACCOUNT.address, CUR_PASSWORD);
+        });
+      });
+
+      it('sets the infoMessage for success/failure', () => {
+        return store.testPassword().then(() => {
+          expect(store.infoMessage).not.to.be.null;
+        });
+      });
+    });
+  });
+});
diff --git a/js/src/redux/actions.js b/js/src/redux/actions.js
index 0be511bd3..0618adfd3 100644
--- a/js/src/redux/actions.js
+++ b/js/src/redux/actions.js
@@ -16,6 +16,7 @@
 
 import { newError } from '~/ui/Errors/actions';
 import { setAddressImage } from './providers/imagesActions';
+import { showSnackbar } from './providers/snackbarActions';
 import { clearStatusLogs, toggleStatusLogs, toggleStatusRefresh } from './providers/statusActions';
 import { toggleView } from '~/views/Settings/actions';
 
@@ -23,6 +24,7 @@ export {
   newError,
   clearStatusLogs,
   setAddressImage,
+  showSnackbar,
   toggleStatusLogs,
   toggleStatusRefresh,
   toggleView
diff --git a/js/src/ui/Icons/index.js b/js/src/ui/Icons/index.js
index 84061f8ed..8901d7dc7 100644
--- a/js/src/ui/Icons/index.js
+++ b/js/src/ui/Icons/index.js
@@ -24,6 +24,7 @@ import LockedIcon from 'material-ui/svg-icons/action/lock-outline';
 import NextIcon from 'material-ui/svg-icons/navigation/arrow-forward';
 import PrevIcon from 'material-ui/svg-icons/navigation/arrow-back';
 import SaveIcon from 'material-ui/svg-icons/content/save';
+import SendIcon from 'material-ui/svg-icons/content/send';
 import SnoozeIcon from 'material-ui/svg-icons/av/snooze';
 import VisibleIcon from 'material-ui/svg-icons/image/remove-red-eye';
 
@@ -38,6 +39,7 @@ export {
   NextIcon,
   PrevIcon,
   SaveIcon,
+  SendIcon,
   SnoozeIcon,
   VisibleIcon
 };
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
index 058c20db3..9245e0a1a 100644
--- a/js/src/views/Account/Header/header.js
+++ b/js/src/views/Account/Header/header.js
@@ -72,7 +72,7 @@ export default class Header extends Component {
           </div>
 
           <div className={ styles.tags }>
-            <Tags tags={ meta.tags } />
+            <Tags tags={ meta.tags.slice() } />
           </div>
           <div className={ styles.balances }>
             <Balance