diff --git a/background.html b/background.html
index 8d2db706c..bfdf0f280 100644
--- a/background.html
+++ b/background.html
@@ -564,25 +564,10 @@
     <div class='step'>
       <div class='inner'>
         <div class='step-body'>
-          <img class='banner-image' src='images/icon_128.png' />
-          <div class='header'>Create your Signal Account</div>
-          <div id='phone-number-input'>
-            <div class='phone-input-form'>
-                <div id='number-container' class='number-container'>
-                  <input type='tel' class='number' placeholder='Phone Number' />
-                </div>
-            </div>
-          </div>
-          <div class='clearfix'>
-            <a class='button' id='request-sms'>Send SMS</a>
-            <a class='link' id='request-voice' tabindex=-1>Call</a>
-          </div>
-          <input class='form-control' type='text' pattern='\s*[0-9]{3}-?[0-9]{3}\s*' title='Enter your 6-digit verification code. If you did not receive a code, click Call or Send SMS to request a new one' id='code' placeholder='Verification Code' autocomplete='off'>
-          <div id='error' class='collapse'></div>
-          <div id=status></div>
+          <div class='header'>Create your Loki Messenger Account</div>
         </div>
         <div class='nav'>
-          <a class='button' id='verifyCode' data-loading-text='Please wait...'>Register</a>
+          <a class='button' id='register' data-loading-text='Please wait...'>Register</a>
         </div>
       </div>
     </div>
diff --git a/js/background.js b/js/background.js
index b9f6277d9..5a6457a4e 100644
--- a/js/background.js
+++ b/js/background.js
@@ -536,7 +536,7 @@
     } else if (window.isImportMode()) {
       appView.openImporter();
     } else {
-      appView.openInstaller();
+      appView.openStandalone();
     }
 
     Whisper.events.on('showDebugLog', () => {
diff --git a/js/views/standalone_registration_view.js b/js/views/standalone_registration_view.js
index 8756758f5..b46825fb3 100644
--- a/js/views/standalone_registration_view.js
+++ b/js/views/standalone_registration_view.js
@@ -30,16 +30,11 @@
       'click #request-voice': 'requestVoice',
       'click #request-sms': 'requestSMSVerification',
       'change #code': 'onChangeCode',
-      'click #verifyCode': 'verifyCode',
+      'click #register': 'register',
     },
-    verifyCode() {
-      const number = this.phoneView.validateNumber();
-      const verificationCode = $('#code')
-        .val()
-        .replace(/\D+/g, '');
-
+    register() {
       this.accountManager
-        .registerSingleDevice(number, verificationCode)
+        .registerSingleDevice()
         .then(() => {
           this.$el.trigger('openInbox');
         })
@@ -49,17 +44,6 @@
       window.log.info(s);
       this.$('#status').text(s);
     },
-    validateCode() {
-      const verificationCode = $('#code')
-        .val()
-        .replace(/\D/g, '');
-
-      if (verificationCode.length === 6) {
-        return verificationCode;
-      }
-
-      return null;
-    },
     displayError(error) {
       this.$('#error')
         .hide()
diff --git a/main.js b/main.js
index 8bfda8018..b55266ea6 100644
--- a/main.js
+++ b/main.js
@@ -723,7 +723,7 @@ ipc.on('remove-setup-menu-items', () => {
 
 ipc.on('add-setup-menu-items', () => {
   setupMenu({
-    includeSetup: true,
+    includeSetup: false,
   });
 });