diff --git a/src/resources/vue/components/Signup.vue b/src/resources/vue/components/Signup.vue
index a390ec17..2575efb0 100644
--- a/src/resources/vue/components/Signup.vue
+++ b/src/resources/vue/components/Signup.vue
@@ -1,158 +1,165 @@
 <template>
     <div class="container">
         <div class="card" id="step1">
             <div class="card-body">
                 <h4 class="card-title">Step 1/3</h4>
                 <p class="card-text">
                     Sign up to start your free month.
                 </p>
                 <form v-on:submit.prevent="submitStep1" data-validation-prefix="signup_">
                     <div class="form-group">
                         <label for="signup_name" class="sr-only">Your Name</label>
                         <input type="text" class="form-control" id="signup_name" placeholder="Your Name" required autofocus v-model="name">
                     </div>
                     <div class="form-group">
                         <label for="signup_email" class="sr-only">Existing Email Address</label>
                         <input type="text" class="form-control" id="signup_email" placeholder="Existing Email Address" required v-model="email">
                     </div>
                     <button class="btn btn-primary" type="submit">Continue</button>
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step2">
             <div class="card-body">
                 <h4 class="card-title">Step 2/3</h4>
                 <p class="card-text">
                     We sent out a confirmation code to your email address.
                     Enter the code we sent you, or click the link in the message.
                 </p>
                 <form v-on:submit.prevent="submitStep2" data-validation-prefix="signup_">
                     <div class="form-group">
-                        <label for="signup_code" class="sr-only">Confirmation Code</label>
-                        <input type="text" class="form-control" id="signup_code" placeholder="Confirmation Code" required v-model="short_code">
+                        <label for="signup_short_code" class="sr-only">Confirmation Code</label>
+                        <input type="text" class="form-control" id="signup_short_code" placeholder="Confirmation Code" required v-model="short_code">
                     </div>
                     <button class="btn btn-secondary" type="button" v-on:click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit">Continue</button>
+                    <input type="hidden" id="signup_code" v-model="code" />
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step3">
             <div class="card-body">
                 <h4 class="card-title">Step 3/3</h4>
                 <p class="card-text">
                     Create your Kolab identity (you can choose additional addresses later).
                 </p>
                 <form v-on:submit.prevent="submitStep3" data-validation-prefix="signup_">
                     <div class="form-group">
                         <label for="signup_login" class="sr-only"></label>
                         <div class="input-group">
                             <input type="text" class="form-control" id="signup_login" required v-model="login">
-                            <span class="input-group-text border-left-0 border-right-0 rounded-0">@{{ domain }}</span>
+                            <span class="input-group-append">
+                                <span class="input-group-text">@{{ domain }}</span>
+                            </span>
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="signup_password" class="sr-only">Password</label>
                         <input type="password" class="form-control" id="signup_password" placeholder="Password" required v-model="password">
                     </div>
                     <div class="form-group">
                         <label for="signup_confirm" class="sr-only">Confirm Password</label>
                         <input type="password" class="form-control" id="signup_confirm" placeholder="Confirm Password" required v-model="password_confirmation">
                     </div>
                     <button class="btn btn-secondary" type="button" v-on:click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit">Submit</button>
                 </form>
             </div>
         </div>
 
     </div>
 </template>
 
 <script>
     import store from '../js/store'
 
     export default {
         data() {
             return {
                 email: '',
                 name: '',
                 code: '',
                 short_code: '',
                 login: '',
                 password: '',
                 password_confirmation: '',
                 domain: window.config['app.domain']
             }
         },
         created() {
             // Verification code provided, jump to Step 2
             if (this.$route.params.code && /^([A-Z0-9]+)-([a-zA-Z0-9]+)$/.test(this.$route.params.code)) {
                 this.short_code = RegExp.$1
                 this.code = RegExp.$2
                 this.submitStep2()
             }
         },
+        mounted() {
+            // Focus the first input (autofocus does not work when using the menu/router)
+            $('#signup_name:visible').focus();
+        },
         methods: {
             // Submits data to the API, validates and gets verification code
             submitStep1() {
                 this.$root.$emit('clearFormValidation', $('#step1 form'))
 
                 axios.post('/api/auth/signup/init', {
                     email: this.email,
                     name: this.name
                 }).then(response => {
                     $('#step1').addClass('d-none')
                     $('#step2').removeClass('d-none').find('input').first().focus()
                     this.code = response.data.code
                 })
             },
             // Submits the code to the API for verification
             submitStep2() {
                 this.$root.$emit('clearFormValidation', $('#step2 form'))
 
                 axios.post('/api/auth/signup/verify', {
                     email: this.email,
                     name: this.name,
                     code: this.code,
                     short_code: this.short_code
                 }).then(response => {
                     $('#step1,#step2').addClass('d-none')
                     $('#step3').removeClass('d-none').find('input').first().focus()
 
                     // Reset user name/email, we don't have them if user used a verification link
                     this.name = response.data.name
                     this.email = response.data.email
                 })
             },
             // Submits the data to the API to create the user account
             submitStep3() {
                 this.$root.$emit('clearFormValidation', $('#step3 form'))
 
                 axios.post('/api/auth/signup', {
                     code: this.code,
                     short_code: this.short_code,
                     email: this.email,
                     login: this.login,
                     password: this.password,
                     password_confirmation: this.password_confirmation
                 }).then(response => {
                     $('#step2').addClass('d-none')
                     $('#step3').removeClass('d-none').find('input').first().focus()
 
                     // auto-login and goto dashboard
                     store.commit('loginUser')
                     localStorage.setItem('token', response.data.access_token)
                     this.$router.push({name: 'dashboard'})
                 })
             },
             // Moves the user a step back in registration form
             stepBack(e) {
                 var card = $(e.target).closest('.card')
 
                 card.prev().removeClass('d-none')
                 card.addClass('d-none').find('form')[0].reset()
             }
         }
     }
 </script>
diff --git a/src/tests/Browser/SignupTest.php b/src/tests/Browser/SignupTest.php
index 60a86a71..904edffb 100644
--- a/src/tests/Browser/SignupTest.php
+++ b/src/tests/Browser/SignupTest.php
@@ -1,136 +1,267 @@
 <?php
 
 namespace Tests\Browser;
 
+use App\SignupCode;
+use App\User;
+
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Signup;
 
 use Tests\DuskTestCase;
 use Laravel\Dusk\Browser;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class SignupTest extends DuskTestCase
 {
+    /**
+     * {@inheritDoc}
+     *
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        User::where('email', 'SignupTestDusk@' . \config('app.domain'))->delete();
+
+        parent::tearDown();
+    }
 
     /**
      * Test 1st step of the signup process
      *
      * @return void
      */
     public function testSignupStep1()
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Signup());
 
             $browser->assertVisible('@step1');
 
+            // Here we expect two text inputs and Continue
+            $browser->with('@step1', function ($step) {
+                $step->assertVisible('#signup_name');
+                $step->assertFocused('#signup_name');
+                $step->assertVisible('#signup_email');
+                $step->assertVisible('[type=submit]');
+            });
+
             // Submit empty form
             // Both Step 1 inputs are required, so after pressing Submit
             // we expect focus to be moved to the first input
             $browser->with('@step1', function ($step) {
                 $step->click('[type=submit]');
                 $step->assertFocused('#signup_name');
             });
 
             // Submit invalid email
             // We expect email input to have is-invalid class added, with .invalid-feedback element
             $browser->with('@step1', function ($step) use ($browser) {
                 $step->type('#signup_name', 'Test User');
                 $step->type('#signup_email', '@test');
                 $step->click('[type=submit]');
 
                 $step->waitFor('#signup_email.is-invalid');
                 $step->waitFor('#signup_email + .invalid-feedback');
                 $browser->waitFor('.toast-error');
+                $browser->click('.toast-error'); // remove the toast
             });
 
             // Submit valid data
             // We expect error state on email input to be removed, and Step 2 form visible
             $browser->with('@step1', function ($step) {
                 $step->type('#signup_name', 'Test User');
                 $step->type('#signup_email', 'BrowserSignupTestUser1@kolab.org');
                 $step->click('[type=submit]');
 
                 $step->assertMissing('#signup_email.is-invalid');
                 $step->assertMissing('#signup_email + .invalid-feedback');
+
+                $step->waitUntilMissing('#signup_code[value=""]');
             });
 
             $browser->waitFor('@step2');
             $browser->assertMissing('@step1');
         });
     }
 
     /**
      * Test 2nd Step of the signup process
      *
      * @depends testSignupStep1
      * @return void
      */
     public function testSignupStep2()
     {
         $this->browse(function (Browser $browser) {
             $browser->assertVisible('@step2');
 
             // Here we expect one text input, Back and Continue buttons
             $browser->with('@step2', function ($step) {
-                $step->assertVisible('#signup_code');
+                $step->assertVisible('#signup_short_code');
+                $step->assertFocused('#signup_short_code');
                 $step->assertVisible('[type=button]');
                 $step->assertVisible('[type=submit]');
             });
 
+            // Test Back button functionality
             $browser->click('@step2 [type=button]');
             $browser->waitFor('@step1');
             $browser->assertMissing('@step2');
 
             // Submit valid Step 1 data (again)
             $browser->with('@step1', function ($step) {
                 $step->type('#signup_name', 'Test User');
                 $step->type('#signup_email', 'BrowserSignupTestUser1@kolab.org');
                 $step->click('[type=submit]');
             });
 
             $browser->waitFor('@step2');
             $browser->assertMissing('@step1');
 
             // Submit invalid code
             // We expect code input to have is-invalid class added, with .invalid-feedback element
             $browser->with('@step2', function ($step) use ($browser) {
-                $step->type('#signup_code', 'XXXXX');
+                $step->type('#signup_short_code', 'XXXXX');
                 $step->click('[type=submit]');
 
-                $step->waitFor('#signup_code.is-invalid');
-                $step->waitFor('#signup_code + .invalid-feedback');
                 $browser->waitFor('.toast-error');
+
+                $step->assertVisible('#signup_short_code.is-invalid');
+                $step->assertVisible('#signup_short_code + .invalid-feedback');
+                $step->assertFocused('#signup_short_code');
+
+                $browser->click('.toast-error'); // remove the toast
             });
 
             // Submit valid code
             // We expect error state on code input to be removed, and Step 3 form visible
-            $browser->with('@step1', function ($step) {
-                // TODO: check existence of the signup code in ajax response
-                //       Get the short_code from database
+            $browser->with('@step2', function ($step) {
+                // Get the code and short_code from database
+                // FIXME: Find a nice way to read javascript data without using hidden inputs
+                $code = $step->value('#signup_code');
+
+                $this->assertNotEmpty($code);
+
+                $code = SignupCode::find($code);
 
-                $step->type('#signup_code', 'YYYYYY');
+                $step->type('#signup_short_code', $code->short_code);
                 $step->click('[type=submit]');
 
-                $step->assertMissing('#signup_code.is-invalid');
-                $step->assertMissing('#signup_code + .invalid-feedback');
+                $step->assertMissing('#signup_short_code.is-invalid');
+                $step->assertMissing('#signup_short_code + .invalid-feedback');
             });
 
             $browser->waitFor('@step3');
             $browser->assertMissing('@step2');
         });
+
+        // TODO: Test code verification with an external link
     }
 
     /**
      * Test 3rd Step of the signup process
      *
      * @depends testSignupStep2
      * @return void
      */
     public function testSignupStep3()
     {
         $this->browse(function (Browser $browser) {
             $browser->assertVisible('@step3');
+
+            // Here we expect one text input, Back and Continue buttons
+            $browser->with('@step3', function ($step) {
+                $step->assertVisible('#signup_login');
+                $step->assertVisible('#signup_password');
+                $step->assertVisible('#signup_confirm');
+                $step->assertVisible('[type=button]');
+                $step->assertVisible('[type=submit]');
+                $step->assertFocused('#signup_login');
+                $step->assertSeeIn('#signup_login + span', '@' . \config('app.domain'));
+            });
+
+            // Test Back button
+            $browser->click('@step3 [type=button]');
+            $browser->waitFor('@step2');
+            $browser->assertMissing('@step3');
+
+            // TODO: Test form reset when going back
+
+            // Submit valid code again
+            $browser->with('@step2', function ($step) {
+                $code = $step->value('#signup_code');
+
+                $this->assertNotEmpty($code);
+
+                $code = SignupCode::find($code);
+
+                $step->type('#signup_short_code', $code->short_code);
+                $step->click('[type=submit]');
+            });
+
+            $browser->waitFor('@step3');
+
+            // Submit invalid data
+            $browser->with('@step3', function ($step) use ($browser) {
+                $step->assertFocused('#signup_login');
+
+                $step->type('#signup_login', '*');
+                $step->type('#signup_password', '12345678');
+                $step->type('#signup_confirm', '123456789');
+
+                $step->click('[type=submit]');
+
+                $browser->waitFor('.toast-error');
+
+                $step->assertVisible('#signup_login.is-invalid');
+                $step->assertVisible('#signup_login + span + .invalid-feedback');
+                $step->assertVisible('#signup_password.is-invalid');
+                $step->assertVisible('#signup_password + .invalid-feedback');
+                $step->assertFocused('#signup_login');
+
+                $browser->click('.toast-error'); // remove the toast
+            });
+
+            // Submit invalid data (valid login, invalid password)
+            $browser->with('@step3', function ($step) use ($browser) {
+                // Make sure the user does not exist (it may happen when executing
+                // tests again after failure)
+                User::where('email', 'SignupTestDusk@' . \config('app.domain'))->delete();
+
+                // FIXME: FOr some reason I can just use ->value() here
+                $step->clear('#signup_login');
+                $step->type('#signup_login', 'SignupTestDusk');
+
+                $step->click('[type=submit]');
+
+                $browser->waitFor('.toast-error');
+
+                $step->assertVisible('#signup_password.is-invalid');
+                $step->assertVisible('#signup_password + .invalid-feedback');
+                $step->assertMissing('#signup_login.is-invalid');
+                $step->assertMissing('#signup_login + span + .invalid-feedback');
+                $step->assertFocused('#signup_password');
+
+                $browser->click('.toast-error'); // remove the toast
+            });
+
+            // Submit valid data
+            $browser->with('@step3', function ($step) {
+                // FIXME: FOr some reason I can just use ->value() here
+                $step->clear('#signup_confirm');
+                $step->type('#signup_confirm', '12345678');
+
+                $step->click('[type=submit]');
+            });
+
+            $browser->waitUntilMissing('@step3');
+
+            // At this point we should be auto-logged-in to dashboard
+            $dashboard = new Dashboard();
+            $dashboard->assert($browser);
+
+            // FIXME: Is it enough to be sure user is logged in?
         });
     }
 }
diff --git a/src/tests/DuskTestCase.php b/src/tests/DuskTestCase.php
index 33eb7503..743f5e28 100644
--- a/src/tests/DuskTestCase.php
+++ b/src/tests/DuskTestCase.php
@@ -1,46 +1,46 @@
 <?php
 
 namespace Tests;
 
 use Laravel\Dusk\TestCase as BaseTestCase;
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 
 abstract class DuskTestCase extends BaseTestCase
 {
     use CreatesApplication;
 
     /**
      * Prepare for Dusk test execution.
      *
      * @beforeClass
      * @return void
      */
     public static function prepare()
     {
         static::startChromeDriver();
     }
 
     /**
      * Create the RemoteWebDriver instance.
      *
      * @return \Facebook\WebDriver\Remote\RemoteWebDriver
      */
     protected function driver()
     {
         $options = (new ChromeOptions())->addArguments([
             '--disable-gpu',
             '--headless',
-            '--window-size=1920,1080',
+            '--window-size=1280,720',
         ]);
 
         return RemoteWebDriver::create(
             'http://localhost:9515',
             DesiredCapabilities::chrome()->setCapability(
                 ChromeOptions::CAPABILITY,
                 $options
             )
         );
     }
 }