diff --git a/src/app/components/login/login.jade b/src/app/components/login/login.jade
index bf15ece58..d23faae4c 100644
--- a/src/app/components/login/login.jade
+++ b/src/app/components/login/login.jade
@@ -3,10 +3,10 @@ md-card
     md-card-title-text
       span.md-title Sign In
   md-card-content
-    form
+    form(ng-submit='$ctrl.go()')
       md-input-container.md-block(md-is-error='$ctrl.valid === 0')
         label Enter your passphrase
-        input(type="{{ $ctrl.show_passphrase ? 'text' : 'password' }}", ng-model='$ctrl.input_passphrase', ng-disabled='$ctrl.random')
+        input(type="{{ $ctrl.show_passphrase ? 'text' : 'password' }}", ng-model='$ctrl.input_passphrase', ng-disabled='$ctrl.random', autofocus)
       md-input-container.md-block
         md-checkbox.md-primary(ng-model="$ctrl.show_passphrase", aria-label="Show passphrase") Show passphrase
     md-content(layout='row', layout-align='center center')
diff --git a/src/app/components/login/login.js b/src/app/components/login/login.js
index e9199bc4e..758c322a1 100644
--- a/src/app/components/login/login.js
+++ b/src/app/components/login/login.js
@@ -114,11 +114,8 @@ app.component('login', {
             }
 
             if (count >= total) {
-              this.$timeout(() => {
-                this.stop()
-                this.setNew()
-              })
-
+              this.stop()
+              this.setNew()
               return
             }
           }
diff --git a/src/app/components/transactions/transactions.jade b/src/app/components/transactions/transactions.jade
index c0487faa8..579d3eab8 100644
--- a/src/app/components/transactions/transactions.jade
+++ b/src/app/components/transactions/transactions.jade
@@ -31,7 +31,7 @@ md-card.offline-hide
                 span.tx(ng-switch-when='4') Multisignature Creation
                 span.tx(ng-switch-when='5') Blockchain Application Registration
                 span.tx(ng-switch-when='6') Transfer Lisk to Blockchain Application
-                span.tx(ng-switch-when='7') Transfer Lisk from Blockchain Applicatio
+                span.tx(ng-switch-when='7') Transfer Lisk from Blockchain Application
                 span(ng-switch-default)
                   span(ng-bind='transaction.senderId', ng-if='transaction.senderId !== $ctrl.account.address')
                   span(ng-bind='transaction.recipientId', ng-if='transaction.senderId === $ctrl.account.address')