diff --git a/Jenkinsfile b/Jenkinsfile
index 73c104ba8..92d08dba3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -148,8 +148,13 @@ node('lisk-nano-01'){
       }
       milestone 1
       /* notify of success if previous build failed */
-      if (currentBuild.getPreviousBuild().result == 'FAILURE') {
-        slackSend color: 'good', message: "Recovery: build #${env.BUILD_NUMBER} of <${env.BUILD_URL}|${env.JOB_NAME}> was sucessful.", channel: '#lisk-nano-jenkins'
+      previous_build = currentBuild.getPreviousBuild()
+      if (previous_build != null && previous_build.result == 'FAILURE') {
+        def pr_branch = ''
+        if (env.CHANGE_BRANCH != null) {
+          pr_branch = " (${env.CHANGE_BRANCH})"
+        }
+        slackSend color: 'good', message: "Recovery: build #${env.BUILD_NUMBER} of <${env.BUILD_URL}|${env.JOB_NAME}>${pr_branch} was successful.", channel: '#lisk-nano-jenkins'
       }
     }
   }
diff --git a/app/main.js b/app/main.js
index 707588a87..3e5055a1e 100644
--- a/app/main.js
+++ b/app/main.js
@@ -1,13 +1,23 @@
 const electron = require('electron'); // eslint-disable-line import/no-extraneous-dependencies
 const path = require('path');
+const buildMenu = require('./menu');
 
-const { app } = electron;
-const { BrowserWindow } = electron;
-const { Menu } = electron;
-const { ipcMain } = electron;
+const { app, BrowserWindow, Menu, ipcMain } = electron;
 
 let win;
+let isUILoaded = false;
+let eventStack = [];
+
 const copyright = `Copyright © 2016 - ${new Date().getFullYear()} Lisk Foundation`;
+const protocolName = 'lisk';
+
+const sendUrlToRouter = (url) => {
+  if (isUILoaded && win && win.webContents) {
+    win.webContents.send('openUrl', url);
+  } else {
+    eventStack.push({ event: 'openUrl', value: url });
+  }
+};
 
 function createWindow() {
   const { width, height } = electron.screen.getPrimaryDisplay().workAreaSize;
@@ -25,134 +35,11 @@ function createWindow() {
   win.on('blur', () => win.webContents.send('blur'));
   win.on('focus', () => win.webContents.send('focus'));
 
-  win.webContents.openDevTools();
-
-  const template = [
-    {
-      label: 'Edit',
-      submenu: [
-        {
-          role: 'undo',
-        },
-        {
-          role: 'redo',
-        },
-        {
-          type: 'separator',
-        },
-        {
-          role: 'cut',
-        },
-        {
-          role: 'copy',
-        },
-        {
-          role: 'paste',
-        },
-        {
-          role: 'selectall',
-        },
-      ],
-    },
-    {
-      label: 'View',
-      submenu: [
-        {
-          role: 'reload',
-        },
-        {
-          role: 'togglefullscreen',
-        },
-      ],
-    },
-    {
-      label: 'Window',
-      submenu: [
-        {
-          role: 'minimize',
-        },
-      ],
-    },
-    {
-      label: 'Help',
-      submenu: [
-        {
-          label: 'Lisk Website',
-          click() {
-            electron.shell.openExternal('https://lisk.io');
-          },
-        },
-        {
-          label: 'Lisk Chat',
-          click() {
-            electron.shell.openExternal('https://lisk.chat');
-          },
-        },
-        {
-          label: 'Lisk Explorer',
-          click() {
-            electron.shell.openExternal('https://explorer.lisk.io');
-          },
-        },
-        {
-          label: 'Lisk Forum',
-          click() {
-            electron.shell.openExternal('https://forum.lisk.io');
-          },
-        },
-        {
-          type: 'separator',
-        },
-        {
-          label: 'Report Issue...',
-          click() {
-            electron.shell.openExternal('https://lisk.zendesk.com/hc/en-us/requests/new');
-          },
-        },
-        {
-          label: 'What\'s New...',
-          click() {
-            electron.shell.openExternal('https://github.com/LiskHQ/lisk-nano/releases');
-          },
-        },
-      ],
-    },
-  ];
-
-  if (process.platform === 'darwin') {
-    const name = app.getName();
-
-    template.unshift({
-      label: name,
-      submenu: [
-        {
-          role: 'about',
-          label: 'About',
-        },
-        {
-          role: 'quit',
-          label: 'Quit',
-        },
-      ],
-    });
-  } else {
-    template[template.length - 1].submenu.push({
-      label: 'About',
-      click(item, focusedWindow) {
-        if (focusedWindow) {
-          const options = {
-            buttons: ['OK'],
-            icon: `${__dirname}/assets/lisk.png`,
-            message: `Lisk Nano\nVersion ${app.getVersion()}\n${copyright}`,
-          };
-          electron.dialog.showMessageBox(focusedWindow, options, () => {});
-        }
-      },
-    });
+  if (process.platform === 'win32') {
+    sendUrlToRouter(process.argv.slice(1));
   }
 
-  const menu = Menu.buildFromTemplate(template);
-  Menu.setApplicationMenu(menu);
+  Menu.setApplicationMenu(buildMenu(app, copyright));
 
   win.loadURL(`file://${__dirname}/dist/index.html`);
 
@@ -183,6 +70,15 @@ function createWindow() {
       selectionMenu.popup(win);
     }
   });
+
+  // Resolve all events from stack when dom is ready
+  win.webContents.on('did-finish-load', () => {
+    isUILoaded = true;
+    if (eventStack.length > 0) {
+      eventStack.forEach(({ event, value }) => win.webContents.send(event, value));
+      eventStack = [];
+    }
+  });
 }
 
 app.on('ready', createWindow);
@@ -207,6 +103,32 @@ app.on('activate', () => {
   }
 });
 
+// Set app protocol
+app.setAsDefaultProtocolClient(protocolName);
+
+// Force single instance application
+const isSecondInstance = app.makeSingleInstance((argv) => {
+  if (process.platform === 'win32') {
+    sendUrlToRouter(argv.slice(1));
+  }
+  if (win) {
+    if (win.isMinimized()) win.restore();
+    win.focus();
+  }
+});
+
+if (isSecondInstance) {
+  app.quit();
+}
+
+app.on('will-finish-launching', () => {
+  // Protocol handler for MacOS
+  app.on('open-url', (event, url) => {
+    event.preventDefault();
+    sendUrlToRouter(url);
+  });
+});
+
 app.on('login', (event, webContents, request, authInfo, callback) => {
   global.myTempFunction = callback;
   event.preventDefault();
@@ -216,3 +138,4 @@ app.on('login', (event, webContents, request, authInfo, callback) => {
 ipcMain.on('proxyCredentialsEntered', (event, username, password) => {
   global.myTempFunction(username, password);
 });
+
diff --git a/app/menu.js b/app/menu.js
new file mode 100644
index 000000000..d461ffd87
--- /dev/null
+++ b/app/menu.js
@@ -0,0 +1,129 @@
+const electron = require('electron'); // eslint-disable-line import/no-extraneous-dependencies
+
+const { Menu } = electron;
+
+const template = [
+  {
+    label: 'Edit',
+    submenu: [
+      {
+        role: 'undo',
+      },
+      {
+        role: 'redo',
+      },
+      {
+        type: 'separator',
+      },
+      {
+        role: 'cut',
+      },
+      {
+        role: 'copy',
+      },
+      {
+        role: 'paste',
+      },
+      {
+        role: 'selectall',
+      },
+    ],
+  },
+  {
+    label: 'View',
+    submenu: [
+      {
+        role: 'reload',
+      },
+      {
+        role: 'togglefullscreen',
+      },
+    ],
+  },
+  {
+    label: 'Window',
+    submenu: [
+      {
+        role: 'minimize',
+      },
+    ],
+  },
+  {
+    label: 'Help',
+    submenu: [
+      {
+        label: 'Lisk Website',
+        click() {
+          electron.shell.openExternal('https://lisk.io');
+        },
+      },
+      {
+        label: 'Lisk Chat',
+        click() {
+          electron.shell.openExternal('https://lisk.chat');
+        },
+      },
+      {
+        label: 'Lisk Explorer',
+        click() {
+          electron.shell.openExternal('https://explorer.lisk.io');
+        },
+      },
+      {
+        label: 'Lisk Forum',
+        click() {
+          electron.shell.openExternal('https://forum.lisk.io');
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: 'Report Issue...',
+        click() {
+          electron.shell.openExternal('https://lisk.zendesk.com/hc/en-us/requests/new');
+        },
+      },
+      {
+        label: 'What\'s New...',
+        click() {
+          electron.shell.openExternal('https://github.com/LiskHQ/lisk-nano/releases');
+        },
+      },
+    ],
+  },
+];
+
+module.exports = (app, copyright) => {
+  if (process.platform === 'darwin') {
+    const name = app.getName();
+    template.unshift({
+      label: name,
+      submenu: [
+        {
+          role: 'about',
+          label: 'About',
+        },
+        {
+          role: 'quit',
+          label: 'Quit',
+        },
+      ],
+    });
+  } else {
+    template[template.length - 1].submenu.push({
+      label: 'About',
+      click(item, focusedWindow) {
+        if (focusedWindow) {
+          const options = {
+            buttons: ['OK'],
+            icon: `${__dirname}/assets/lisk.png`,
+            message: `Lisk Nano\nVersion ${app.getVersion()}\n${copyright}`,
+          };
+          electron.dialog.showMessageBox(focusedWindow, options, () => {});
+        }
+      },
+    });
+  }
+  return Menu.buildFromTemplate(template);
+};
diff --git a/package.json b/package.json
index 0ed1f2fb0..14ed57ef4 100644
--- a/package.json
+++ b/package.json
@@ -132,6 +132,10 @@
   "build": {
     "appId": "io.lisk.nano",
     "productName": "Lisk Nano",
+    "protocols": {
+      "name": "lisk-nano",
+      "schemes": ["lisk"]
+    },
     "artifactName": "lisk-nano-${os}-${arch}-${version}.${ext}",
     "linux": {
       "target": [
diff --git a/src/components/actionBar/index.js b/src/components/actionBar/index.js
index b5b443cbb..34eb8a62e 100644
--- a/src/components/actionBar/index.js
+++ b/src/components/actionBar/index.js
@@ -12,7 +12,8 @@ export const ActionBarRaw = ({
     <Button
       label={secondaryButton.label || t('Cancel')}
       className={secondaryButton.className || 'cancel-button'}
-      onClick={secondaryButton.onClick} />
+      onClick={secondaryButton.onClick}
+      type={secondaryButton.type || 'button'} />
 
     <PricedButton
       t={t}
@@ -23,6 +24,7 @@ export const ActionBarRaw = ({
       balance={account ? account.balance : 0}
       customClassName={primaryButton.className || 'submit-button'}
       disabled={primaryButton.disabled}
+      type={primaryButton.type}
       onClick={primaryButton.onClick} />
   </section>
 );
diff --git a/src/components/login/login.js b/src/components/login/login.js
index 1d24e0c8b..7f5ebcb31 100644
--- a/src/components/login/login.js
+++ b/src/components/login/login.js
@@ -135,6 +135,11 @@ class Login extends React.Component {
     }
   }
 
+  onFormSubmit(event) {
+    event.preventDefault();
+    this.onLoginSubmission(this.state.passphrase);
+  }
+
   autoLogin() {
     const { savedAccounts } = this.props;
     if (savedAccounts && savedAccounts.length > 0 && !this.props.account.afterLogout) {
@@ -160,7 +165,7 @@ class Login extends React.Component {
       <div className={`box ${styles.wrapper}`}>
         <div className={`${grid.row} ${grid['center-xs']}`}>
           <div className={`${grid['col-xs-12']} ${grid['col-sm-8']}`}>
-            <form>
+            <form onSubmit={this.onFormSubmit.bind(this)}>
               <Dropdown
                 auto={false}
                 source={this.networks}
@@ -193,8 +198,8 @@ class Login extends React.Component {
                     {this.props.t('New Account')}
                   </RelativeLink>
                   <Button label={this.props.t('Login')} primary raised
-                    onClick={this.onLoginSubmission.bind(this, this.state.passphrase)}
                     className='login-button'
+                    type='submit'
                     disabled={(this.state.network === 2 && this.state.addressValidity !== '') ||
                     this.state.passphraseValidity !== ''} />
                 </div>
diff --git a/src/components/passphrase/passphraseVerifier.js b/src/components/passphrase/passphraseVerifier.js
index a43302694..baeb11b3c 100644
--- a/src/components/passphrase/passphraseVerifier.js
+++ b/src/components/passphrase/passphraseVerifier.js
@@ -17,11 +17,11 @@ class PassphraseConfirmator extends React.Component {
   }
 
   hideRandomWord(rand = Math.random()) {
-    const words = this.props.passphrase.trim().split(/\s+/);
+    const words = this.props.passphrase.trim().split(/\s+/).filter(item => item.length > 0);
     const index = Math.floor(rand * (words.length - 1));
 
     this.setState({
-      passphraseParts: this.props.passphrase.split(` ${words[index]} `),
+      passphraseParts: this.props.passphrase.split(words[index]),
       missing: words[index],
       answer: '',
     });
diff --git a/src/components/passphrase/passphraseVerifier.test.js b/src/components/passphrase/passphraseVerifier.test.js
index 044dfffad..9f51fd16f 100644
--- a/src/components/passphrase/passphraseVerifier.test.js
+++ b/src/components/passphrase/passphraseVerifier.test.js
@@ -39,8 +39,8 @@ describe('PassphraseVerifier', () => {
       const randomIndex = 0.6;
       const expectedValues = {
         passphraseParts: [
-          'survey stereo pool fortune oblige slight',
-          'goddess mistake sentence anchor pool',
+          'survey stereo pool fortune oblige slight ',
+          ' goddess mistake sentence anchor pool',
         ],
         missing: 'gravity',
         answer: '',
diff --git a/src/components/pricedButton/index.js b/src/components/pricedButton/index.js
index 67faccfde..c0cc2be8e 100644
--- a/src/components/pricedButton/index.js
+++ b/src/components/pricedButton/index.js
@@ -5,7 +5,7 @@ import { fromRawLsk } from '../../utils/lsk';
 import styles from './pricedButton.css';
 
 export const PricedButtonComponent = ({
-  balance, fee, label, customClassName, onClick, disabled, t,
+  balance, fee, label, customClassName, onClick, disabled, type, t,
 }) => {
   const hasFunds = balance >= fee;
   return (
@@ -23,6 +23,7 @@ export const PricedButtonComponent = ({
         label={label}
         primary={true}
         raised={true}
+        type={type || 'button'}
         className={`next-button ${customClassName}`}
         disabled={disabled || (fee && !hasFunds)}
         onClick={onClick} />
diff --git a/src/components/registerDelegate/registerDelegate.js b/src/components/registerDelegate/registerDelegate.js
index 8d6aac814..a46844c6c 100644
--- a/src/components/registerDelegate/registerDelegate.js
+++ b/src/components/registerDelegate/registerDelegate.js
@@ -27,7 +27,8 @@ class RegisterDelegate extends React.Component {
     this.setState(newState);
   }
 
-  register() {
+  register(event) {
+    event.preventDefault();
     // @todo I'm not handling this part: this.setState({ nameError: error.message });
     this.props.delegateRegistered({
       activePeer: this.props.peers.data,
@@ -41,33 +42,35 @@ class RegisterDelegate extends React.Component {
   render() {
     return (
       <div>
-        <Input label={this.props.t('Delegate name')} required={true}
-          autoFocus={true}
-          className='username'
-          onChange={handleChange.bind(this, this, 'name')}
-          error={this.state.name.error}
-          value={this.state.name.value} />
-        <AuthInputs
-          passphrase={this.state.passphrase}
-          secondPassphrase={this.state.secondPassphrase}
-          onChange={handleChange.bind(this, this)} />
-        <hr/>
-        <InfoParagraph>
-          {this.props.t('Becoming a delegate requires registration. You may choose your own delegate name, which can be used to promote your delegate. Only the top 101 delegates are eligible to forge. All fees are shared equally between the top 101 delegates.')}
-        </InfoParagraph>
-        <ActionBar
-          secondaryButton={{
-            onClick: this.props.closeDialog,
-          }}
-          primaryButton={{
-            label: this.props.t('Register'),
-            fee: Fees.registerDelegate,
-            className: 'register-button',
-            disabled: (!this.state.name.value ||
-              this.props.account.isDelegate ||
-              !authStateIsValid(this.state)),
-            onClick: this.register.bind(this),
-          }} />
+        <form onSubmit={this.register.bind(this)}>
+          <Input label={this.props.t('Delegate name')} required={true}
+            autoFocus={true}
+            className='username'
+            onChange={handleChange.bind(this, this, 'name')}
+            error={this.state.name.error}
+            value={this.state.name.value} />
+          <AuthInputs
+            passphrase={this.state.passphrase}
+            secondPassphrase={this.state.secondPassphrase}
+            onChange={handleChange.bind(this, this)} />
+          <hr/>
+          <InfoParagraph>
+            {this.props.t('Becoming a delegate requires registration. You may choose your own delegate name, which can be used to promote your delegate. Only the top 101 delegates are eligible to forge. All fees are shared equally between the top 101 delegates.')}
+          </InfoParagraph>
+          <ActionBar
+            secondaryButton={{
+              onClick: this.props.closeDialog,
+            }}
+            primaryButton={{
+              label: this.props.t('Register'),
+              fee: Fees.registerDelegate,
+              type: 'submit',
+              className: 'register-button',
+              disabled: (!this.state.name.value ||
+                this.props.account.isDelegate ||
+                !authStateIsValid(this.state)),
+            }} />
+        </form>
       </div>
     );
   }
diff --git a/src/components/registerDelegate/registerDelegate.test.js b/src/components/registerDelegate/registerDelegate.test.js
index b39dd8f14..8ede63945 100644
--- a/src/components/registerDelegate/registerDelegate.test.js
+++ b/src/components/registerDelegate/registerDelegate.test.js
@@ -92,7 +92,7 @@ describe('RegisterDelegate', () => {
 
     it('allows register as delegate for a non delegate account', () => {
       wrapper.find('.username input').simulate('change', { target: { value: 'sample_username' } });
-      wrapper.find('.next-button').simulate('click');
+      wrapper.find('.next-button').simulate('submit');
       expect(wrapper.find('.primary-button button').props().disabled).to.not.equal(true);
       expect(props.delegateRegistered).to.have.been.calledWith();
     });
diff --git a/src/components/send/send.js b/src/components/send/send.js
index baef8800a..35cf6cfbd 100644
--- a/src/components/send/send.js
+++ b/src/components/send/send.js
@@ -62,7 +62,8 @@ class Send extends React.Component {
     return undefined;
   }
 
-  send() {
+  send(event) {
+    event.preventDefault();
     this.props.sent({
       activePeer: this.props.activePeer,
       account: this.props.account,
@@ -84,41 +85,43 @@ class Send extends React.Component {
   render() {
     return (
       <div className={`${styles.send} send`}>
-        <Input label={this.props.t('Recipient Address')} required={true}
-          className='recipient'
-          autoFocus={true}
-          error={this.state.recipient.error}
-          value={this.state.recipient.value}
-          onChange={this.handleChange.bind(this, 'recipient')} />
-        <Input label={this.props.t('Transaction Amount')} required={true}
-          className='amount'
-          error={this.state.amount.error}
-          value={this.state.amount.value}
-          onChange={this.handleChange.bind(this, 'amount')} />
-        <AuthInputs
-          passphrase={this.state.passphrase}
-          secondPassphrase={this.state.secondPassphrase}
-          onChange={this.handleChange.bind(this)} />
-        <div className={styles.fee}> Fee: {this.fee} LSK</div>
-        <IconMenu icon='more_vert' position='topRight' menuRipple className={`${styles.sendAllMenu} transaction-amount`} >
-          <MenuItem onClick={this.setMaxAmount.bind(this)}
-            caption={this.props.t('Set maximum amount')}
-            className='send-maximum-amount'/>
-        </IconMenu>
-        <ActionBar
-          secondaryButton={{
-            onClick: this.props.closeDialog,
-          }}
-          primaryButton={{
-            label: this.props.t('Send'),
-            disabled: (
-              !!this.state.recipient.error ||
-              !this.state.recipient.value ||
-              !!this.state.amount.error ||
-              !this.state.amount.value ||
-              !authStateIsValid(this.state)),
-            onClick: this.send.bind(this),
-          }} />
+        <form onSubmit={this.send.bind(this)}>
+          <Input label={this.props.t('Recipient Address')} required={true}
+            className='recipient'
+            autoFocus={true}
+            error={this.state.recipient.error}
+            value={this.state.recipient.value}
+            onChange={this.handleChange.bind(this, 'recipient')} />
+          <Input label={this.props.t('Transaction Amount')} required={true}
+            className='amount'
+            error={this.state.amount.error}
+            value={this.state.amount.value}
+            onChange={this.handleChange.bind(this, 'amount')} />
+          <AuthInputs
+            passphrase={this.state.passphrase}
+            secondPassphrase={this.state.secondPassphrase}
+            onChange={this.handleChange.bind(this)} />
+          <div className={styles.fee}> {this.props.t('Fee: {{fee}} LSK', { fee: this.fee })} </div>
+          <IconMenu icon='more_vert' position='topRight' menuRipple className={`${styles.sendAllMenu} transaction-amount`} >
+            <MenuItem onClick={this.setMaxAmount.bind(this)}
+              caption={this.props.t('Set maximum amount')}
+              className='send-maximum-amount'/>
+          </IconMenu>
+          <ActionBar
+            secondaryButton={{
+              onClick: this.props.closeDialog,
+            }}
+            primaryButton={{
+              label: this.props.t('Send'),
+              type: 'submit',
+              disabled: (
+                !!this.state.recipient.error ||
+                !this.state.recipient.value ||
+                !!this.state.amount.error ||
+                !this.state.amount.value ||
+                !authStateIsValid(this.state)),
+            }} />
+        </form>
       </div>
     );
   }
diff --git a/src/components/send/send.test.js b/src/components/send/send.test.js
index 63b0e6d89..d9fb79cf4 100644
--- a/src/components/send/send.test.js
+++ b/src/components/send/send.test.js
@@ -92,7 +92,7 @@ describe('Send', () => {
   it('allows to send a transaction', () => {
     wrapper.find('.amount input').simulate('change', { target: { value: '120.25' } });
     wrapper.find('.recipient input').simulate('change', { target: { value: '11004588490103196952L' } });
-    wrapper.find('.primary-button button').simulate('click');
+    wrapper.find('.primary-button button').simulate('submit');
     expect(props.sent).to.have.been.calledWith({
       account: props.account,
       activePeer: {},
diff --git a/src/components/signMessage/signMessage.js b/src/components/signMessage/signMessage.js
index 7c8006859..d8a607f44 100644
--- a/src/components/signMessage/signMessage.js
+++ b/src/components/signMessage/signMessage.js
@@ -42,7 +42,8 @@ class SignMessageComponent extends React.Component {
     this.setState({ result, resultIsShown: false, message });
   }
 
-  showResult() {
+  showResult(event) {
+    event.preventDefault();
     const copied = this.props.copyToClipboard(this.state.result, {
       message: this.props.t('Press #{key} to copy'),
     });
@@ -60,31 +61,33 @@ class SignMessageComponent extends React.Component {
           <br />
           {this.props.t('Note: Digital Signatures and signed messages are not encrypted!')}
         </InfoParagraph>
-        <section>
-          <Input className='message' multiline label={this.props.t('Message')}
-            autoFocus={true}
-            value={this.state.message}
-            onChange={this.sign.bind(this)} />
-          <AuthInputs
-            passphrase={this.state.passphrase}
-            secondPassphrase={this.state.secondPassphrase}
-            onChange={this.handleChange.bind(this)} />
-        </section>
-        {this.state.resultIsShown ?
-          <SignVerifyResult result={this.state.result} title={this.props.t('Result')} /> :
-          <ActionBar
-            secondaryButton={{
-              onClick: this.props.closeDialog,
-            }}
-            primaryButton={{
-              label: this.props.t('Sign and copy result to clipboard'),
-              className: 'sign-button',
-              disabled: (!this.state.result ||
-                this.state.resultIsShown ||
-                !authStateIsValid(this.state)),
-              onClick: this.showResult.bind(this),
-            }} />
-        }
+        <form onSubmit={this.showResult.bind(this)}>
+          <section>
+            <Input className='message' multiline label={this.props.t('Message')}
+              autoFocus={true}
+              value={this.state.message}
+              onChange={this.sign.bind(this)} />
+            <AuthInputs
+              passphrase={this.state.passphrase}
+              secondPassphrase={this.state.secondPassphrase}
+              onChange={this.handleChange.bind(this)} />
+          </section>
+          {this.state.resultIsShown ?
+            <SignVerifyResult result={this.state.result} title={this.props.t('Result')} /> :
+            <ActionBar
+              secondaryButton={{
+                onClick: this.props.closeDialog,
+              }}
+              primaryButton={{
+                label: this.props.t('Sign and copy result to clipboard'),
+                className: 'sign-button',
+                type: 'submit',
+                disabled: (!this.state.result ||
+                  this.state.resultIsShown ||
+                  !authStateIsValid(this.state)),
+              }} />
+          }
+        </form>
       </div>
     );
   }
diff --git a/src/components/voteDialog/voteDialog.js b/src/components/voteDialog/voteDialog.js
index 6c8b0b6da..097e089be 100644
--- a/src/components/voteDialog/voteDialog.js
+++ b/src/components/voteDialog/voteDialog.js
@@ -20,7 +20,8 @@ export default class VoteDialog extends React.Component {
     this.setState(authStatePrefill(this.props.account));
   }
 
-  confirm() {
+  confirm(event) {
+    event.preventDefault();
     this.props.votePlaced({
       activePeer: this.props.activePeer,
       account: this.props.account,
@@ -49,41 +50,43 @@ export default class VoteDialog extends React.Component {
     });
     return (
       <article>
-        <Autocomplete
-          votedDelegates={this.props.delegates}
-          votes={this.props.votes}
-          voteToggled={this.props.voteToggled}
-          activePeer={this.props.activePeer} />
-        <AuthInputs
-          passphrase={this.state.passphrase}
-          secondPassphrase={this.state.secondPassphrase}
-          onChange={this.handleChange.bind(this)} />
-        <article className={styles.info}>
-          <InfoParagraph>
-            <p >
-              {this.props.t('You can select up to {{count}} delegates in one voting turn.', { count: maxCountOfVotesInOneTurn })}
-            </p>
-            <p >
-              {this.props.t('You can vote for up to {{count}} delegates in total.', { count: maxCountOfVotes })}
-            </p>
-          </InfoParagraph>
-        </article>
+        <form onSubmit={this.confirm.bind(this)}>
+          <Autocomplete
+            votedDelegates={this.props.delegates}
+            votes={this.props.votes}
+            voteToggled={this.props.voteToggled}
+            activePeer={this.props.activePeer} />
+          <AuthInputs
+            passphrase={this.state.passphrase}
+            secondPassphrase={this.state.secondPassphrase}
+            onChange={this.handleChange.bind(this)} />
+          <article className={styles.info}>
+            <InfoParagraph>
+              <p >
+                {this.props.t('You can select up to {{count}} delegates in one voting turn.', { count: maxCountOfVotesInOneTurn })}
+              </p>
+              <p >
+                {this.props.t('You can vote for up to {{count}} delegates in total.', { count: maxCountOfVotes })}
+              </p>
+            </InfoParagraph>
+          </article>
 
-        <ActionBar
-          secondaryButton={{
-            onClick: this.props.closeDialog,
-          }}
-          primaryButton={{
-            label: this.props.t('Confirm'),
-            fee: Fees.vote,
-            disabled: (
-              totalVotes > maxCountOfVotes ||
-              votesList.length === 0 ||
-              votesList.length > maxCountOfVotesInOneTurn ||
-              !authStateIsValid(this.state)
-            ),
-            onClick: this.confirm.bind(this),
-          }} />
+          <ActionBar
+            secondaryButton={{
+              onClick: this.props.closeDialog,
+            }}
+            primaryButton={{
+              label: this.props.t('Confirm'),
+              fee: Fees.vote,
+              type: 'submit',
+              disabled: (
+                totalVotes > maxCountOfVotes ||
+                votesList.length === 0 ||
+                votesList.length > maxCountOfVotesInOneTurn ||
+                !authStateIsValid(this.state)
+              ),
+            }} />
+        </form>
       </article>
     );
   }
diff --git a/src/components/voteDialog/voteDialog.test.js b/src/components/voteDialog/voteDialog.test.js
index 9916615a5..fd9da1b87 100644
--- a/src/components/voteDialog/voteDialog.test.js
+++ b/src/components/voteDialog/voteDialog.test.js
@@ -76,7 +76,7 @@ describe('VoteDialog', () => {
     });
 
     it('should fire votePlaced action if lists are not empty and account balance is sufficient', () => {
-      wrapper.find('VoteDialog .primary-button button').simulate('click');
+      wrapper.find('VoteDialog .primary-button button').simulate('submit');
 
       expect(props.votePlaced).to.have.been.calledWith({
         account: ordinaryAccount,
@@ -109,7 +109,7 @@ describe('VoteDialog', () => {
       wrapper = mount(<VoteDialog {...props} account={accountWithSecondPassphrase} />, options);
       const secondPassphrase = 'test second passphrase';
       wrapper.instance().handleChange('secondPassphrase', secondPassphrase);
-      wrapper.find('.primary-button button').simulate('click');
+      wrapper.find('.primary-button button').simulate('submit');
 
       expect(props.votePlaced).to.have.been.calledWith({
         activePeer: props.activePeer,
diff --git a/src/utils/passphrase.js b/src/utils/passphrase.js
index 25ac2d4af..62f6cd190 100644
--- a/src/utils/passphrase.js
+++ b/src/utils/passphrase.js
@@ -30,8 +30,8 @@ const leftPadd = (str, pad, length) => {
  * Resets previous settings and creates a step with a random length between 1.6% to 3.2%
  */
 const init = (rand = Math.random()) => {
-  let step = Math.max((160 + Math.floor(rand * 160)));
-  step = step >= 0.01 ? step : step * 10;
+  let step = (160 + Math.floor(rand * 160)) / 100;
+  step = step >= 0.01 ? step : 0.1 + (step * 5);
   return {
     step,
     percentage: 0,