diff --git a/src/app/components/login/login.pug b/src/app/components/login/login.pug
index a6152ce9f..858736d9c 100644
--- a/src/app/components/login/login.pug
+++ b/src/app/components/login/login.pug
@@ -11,7 +11,7 @@ md-card
         md-checkbox.md-primary(ng-model="$ctrl.show_passphrase", aria-label="Show passphrase") Show passphrase
     md-content(layout='row', layout-align='center center')
       // md-button(ng-disabled='$ctrl.generatingNewPassphrase', ng-click='$ctrl.devTestAccount()') Dev Test Account
-      md-button.md-primary(ng-disabled='$ctrl.random', ng-click='$ctrl.startGenratingNewPassphrase()') NEW ACCOUNT
+      md-button.md-primary(ng-disabled='$ctrl.random || $ctrl.generatingNewPassphrase', ng-click='$ctrl.startGenratingNewPassphrase()') NEW ACCOUNT
       md-button.md-raised.md-primary(md-autofocus, ng-disabled='$ctrl.valid !== 1', ng-click='$ctrl.doTheLogin()') Login
     md-content(layout-padding, layout='column', layout-align='center center', ng-show='$ctrl.generatingNewPassphrase')
       h4.move(ng-show='$ctrl.mobileAndTabletcheck()') Enter text below to generate random bytes