diff --git a/js/views/install_view.js b/js/views/install_view.js
index a893003a2..ec4d004de 100644
--- a/js/views/install_view.js
+++ b/js/views/install_view.js
@@ -195,7 +195,7 @@
               'confirmNumber: error clearing database',
               error && error.stack ? error.stack : error
             );
-            finish();
+            return finish();
           });
         });
       });
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index 5ca169b78..e94f6803a 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -422,6 +422,12 @@
       );
       await this.deviceNameIsEncrypted();
 
+      window.log.info(
+        `createAccount: Number is ${number}, password has length: ${
+          password ? password.length : 'none'
+        }`
+      );
+
       const response = await this.server.confirmCode(
         number,
         verificationCode,