diff --git a/src/app/Console/Development/DomainStatus.php b/src/app/Console/Development/DomainStatus.php
index 8eb5e3d4..84be982c 100644
--- a/src/app/Console/Development/DomainStatus.php
+++ b/src/app/Console/Development/DomainStatus.php
@@ -1,86 +1,87 @@
 <?php
 
 namespace App\Console\Development;
 
 use App\Domain;
 use Illuminate\Console\Command;
 
 class DomainStatus extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'domain:status {domain} {--add=} {--del=}';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = "Set/get a domain's status.";
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $domain = Domain::where('namespace', $this->argument('domain'))->firstOrFail();
 
         $this->info("Found domain: {$domain->id}");
 
         $statuses = [
             'active' => Domain::STATUS_ACTIVE,
             'suspended' => Domain::STATUS_SUSPENDED,
             'deleted' => Domain::STATUS_DELETED,
             'ldapReady' => Domain::STATUS_LDAP_READY,
             'verified' => Domain::STATUS_VERIFIED,
             'confirmed' => Domain::STATUS_CONFIRMED,
         ];
 
         // I'd prefer "-state" and "+state" syntax, but it's not possible
+        $delete = false;
         if ($update = $this->option('del')) {
             $delete = true;
         } elseif ($update = $this->option('add')) {
-            $delete = false;
+            // do nothing
         }
 
         if (!empty($update)) {
             $map = \array_change_key_case($statuses);
             $update = \strtolower($update);
 
             if (isset($map[$update])) {
                 if ($delete && $domain->status & $map[$update]) {
                     $domain->status ^= $map[$update];
                     $domain->save();
                 } elseif (!$delete && !($domain->status & $map[$update])) {
                     $domain->status |= $map[$update];
                     $domain->save();
                 }
             }
         }
 
         $domain_state = [];
         foreach (\array_keys($statuses) as $state) {
             $func = 'is' . \ucfirst($state);
             if ($domain->$func()) {
                 $domain_state[] = $state;
             }
         }
 
         $this->info("Status: " . \implode(',', $domain_state));
     }
 }
diff --git a/src/app/Console/Development/UserStatus.php b/src/app/Console/Development/UserStatus.php
index 18e81145..c81c73bd 100644
--- a/src/app/Console/Development/UserStatus.php
+++ b/src/app/Console/Development/UserStatus.php
@@ -1,85 +1,86 @@
 <?php
 
 namespace App\Console\Development;
 
 use App\User;
 use Illuminate\Console\Command;
 
 class UserStatus extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'user:status {userid} {--add=} {--del=}';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = "Set/get a user's status.";
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $user = User::where('email', $this->argument('userid'))->firstOrFail();
 
         $this->info("Found user: {$user->id}");
 
         $statuses = [
             'active' => User::STATUS_ACTIVE,
             'suspended' => User::STATUS_SUSPENDED,
             'deleted' => User::STATUS_DELETED,
             'ldapReady' => User::STATUS_LDAP_READY,
             'imapReady' => User::STATUS_IMAP_READY,
         ];
 
         // I'd prefer "-state" and "+state" syntax, but it's not possible
+        $delete = false;
         if ($update = $this->option('del')) {
             $delete = true;
         } elseif ($update = $this->option('add')) {
-            $delete = false;
+            // do nothing
         }
 
         if (!empty($update)) {
             $map = \array_change_key_case($statuses);
             $update = \strtolower($update);
 
             if (isset($map[$update])) {
                 if ($delete && $user->status & $map[$update]) {
                     $user->status ^= $map[$update];
                     $user->save();
                 } elseif (!$delete && !($user->status & $map[$update])) {
                     $user->status |= $map[$update];
                     $user->save();
                 }
             }
         }
 
         $user_state = [];
         foreach (\array_keys($statuses) as $state) {
             $func = 'is' . \ucfirst($state);
             if ($user->$func()) {
                 $user_state[] = $state;
             }
         }
 
         $this->info("Status: " . \implode(',', $user_state));
     }
 }
diff --git a/src/resources/vue/Dashboard.vue b/src/resources/vue/Dashboard.vue
index 129ec1ef..ab532d5b 100644
--- a/src/resources/vue/Dashboard.vue
+++ b/src/resources/vue/Dashboard.vue
@@ -1,104 +1,104 @@
 <template>
     <div v-if="!$root.isLoading" class="container" dusk="dashboard-component">
         <div v-if="!isReady" id="status-box" class="card">
             <div class="card-body">
                 <div class="card-title">Account status: <span class="text-danger">Not ready</span></div>
                 <div class="card-text">
-                    <p>The process to create your account have not been completed yet.
+                    <p>The process to create your account has not been completed yet.
                         Some features may be disabled or readonly.</p>
                     <ul class="status-list">
                         <li v-for="item in statusProcess" :key="item.label">
                             <svg-icon :icon="['far', item.state ? 'check-square' : 'square']"
                                       :class="item.state ? 'text-success' : 'text-muted'"
                             ></svg-icon>
                             <router-link v-if="item.link" :to="{ path: item.link }">{{ item.title }}</router-link>
                             <span v-if="!item.link">{{ item.title }}</span>
                         </li>
                     </ul>
                 </div>
             </div>
         </div>
         <div id="dashboard-nav">
             <router-link class="card link-profile" :to="{ name: 'profile' }">
                 <svg-icon icon="user-cog"></svg-icon><span class="name">Your profile</span>
             </router-link>
             <router-link class="card link-domains" :to="{ name: 'domains' }">
                 <svg-icon icon="globe"></svg-icon><span class="name">Domains</span>
             </router-link>
             <router-link class="card link-users" :to="{ name: 'users' }">
                 <svg-icon icon="users"></svg-icon><span class="name">User accounts</span>
             </router-link>
             <router-link class="card link-wallet" :to="{ name: 'wallet' }">
                 <svg-icon icon="wallet"></svg-icon><span class="name">Wallet</span>
                 <span v-if="balance < 0" class="badge badge-danger">{{ $root.price(balance) }}</span>
             </router-link>
         </div>
     </div>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 isReady: true,
                 statusProcess: [],
                 request: null,
                 balance: 0
             }
         },
         mounted() {
             const authInfo = this.$store.state.isLoggedIn ? this.$store.state.authInfo : null
 
             if (authInfo) {
                 this.parseStatusInfo(authInfo.statusInfo)
                 this.getBalance(authInfo)
             } else {
                 this.$root.startLoading()
                 axios.get('/api/auth/info')
                     .then(response => {
                         this.$store.state.authInfo = response.data
                         this.parseStatusInfo(response.data.statusInfo)
                         this.getBalance(response.data)
                         this.$root.stopLoading()
                     })
                     .catch(this.$root.errorHandler)
             }
         },
         methods: {
             // Displays account status information
             parseStatusInfo(info) {
                 this.statusProcess = info.process
                 this.isReady = info.isReady
 
                 // Update status process info every 10 seconds
                 // FIXME: This probably should have some limit, or the interval
                 //        should grow (well, until it could be done with websocket notifications)
                 if (!info.isReady && !window.infoRequest) {
                     window.infoRequest = setTimeout(() => {
                         delete window.infoRequest
                         // Stop updates after user logged out
                         if (!this.$store.state.isLoggedIn) {
                             return;
                         }
 
                         axios.get('/api/auth/info')
                             .then(response => {
                                 this.$store.state.authInfo = response.data
                                 this.parseStatusInfo(response.data.statusInfo)
                             })
                             .catch(error => {
                                 this.parseStatusInfo(info)
                             })
                     }, 10000);
                 }
             },
             getBalance(authInfo) {
                 this.balance = 0;
                 // TODO: currencies, multi-wallets, accounts
                 authInfo.wallets.forEach(wallet => {
                     this.balance += wallet.balance
                 })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Domain/Info.vue b/src/resources/vue/Domain/Info.vue
index d22b44ff..a7630654 100644
--- a/src/resources/vue/Domain/Info.vue
+++ b/src/resources/vue/Domain/Info.vue
@@ -1,117 +1,117 @@
 <template>
     <div class="container">
         <div v-if="!isReady" id="domain-status-box" class="card">
             <div class="card-body">
                 <div class="card-title">Domain status: <span class="text-danger">Not ready</span></div>
                 <div class="card-text">
-                    <p>The process to create the domain have not been completed yet.
+                    <p>The process to create the domain has not been completed yet.
                         Some features may be disabled or readonly.</p>
                     <ul class="status-list">
                         <li v-for="item in statusProcess" :key="item.label">
                             <svg-icon :icon="['far', item.state ? 'check-square' : 'square']"
                                       :class="item.state ? 'text-success' : 'text-muted'"
                             ></svg-icon>
                             <span>{{ item.title }}</span>
                         </li>
                     </ul>
                 </div>
             </div>
         </div>
         <div v-if="domain && !domain.isConfirmed" class="card" id="domain-verify">
             <div class="card-body">
                 <div class="card-title">Domain verification</div>
                 <div class="card-text">
                     <p>In order to confirm that you're the actual holder of the domain,
                         we need to run a verification process before finally activating it for email delivery.</p>
                     <p>The domain <b>must have one of the following entries</b> in DNS:
                         <ul>
                             <li>TXT entry with value: <code>{{ domain.hash_text }}</code></li>
                             <li>or CNAME entry: <code>{{ domain.hash_cname }}.{{ domain.namespace }}. IN CNAME {{ domain.hash_code }}.{{ domain.namespace }}.</code></li>
                         </ul>
                         When this is done press the button below to start the verification.</p>
                     <p>Here's a sample zone file for your domain: <pre>{{ domain.dns.join("\n") }}</pre></p>
                     <button class="btn btn-primary" type="button" @click="confirm"><svg-icon icon="sync-alt"></svg-icon> Verify</button>
                 </div>
             </div>
         </div>
         <div v-if="domain && domain.isConfirmed" class="card" id="domain-config">
             <div class="card-body">
                 <div class="card-title">Domain configuration</div>
                 <div class="card-text">
                     <p>In order to let {{ app_name }} receive email traffic for your domain you need to adjust
                         the DNS settings, more precisely the MX entries, accordingly.</p>
                     <p>Edit your domain's zone file and replace existing MX
                         entries with the following values: <pre>{{ domain.config.join("\n") }}</pre></p>
                     <p>If you don't know how to set DNS entries for your domain,
                         please contact the registration service where you registered
                         the domain or your web hosting provider.</p>
                 </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 domain_id: null,
                 domain: null,
                 app_name: window.config['app.name'],
                 isReady: true,
                 statusProcess: []
             }
         },
         created() {
             if (this.domain_id = this.$route.params.domain) {
                 axios.get('/api/v4/domains/' + this.domain_id)
                     .then(response => {
                         this.domain = response.data
                         if (!this.domain.isConfirmed) {
                             $('#domain-verify button').focus()
                         }
                         this.parseStatusInfo(response.data.statusInfo)
                     })
                     .catch(this.$root.errorHandler)
             } else {
                 this.$root.errorPage(404)
             }
         },
         destroyed() {
             clearTimeout(window.domainRequest)
         },
         methods: {
             confirm() {
                 axios.get('/api/v4/domains/' + this.domain_id + '/confirm')
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.domain.isConfirmed = true
                             this.parseStatusInfo(response.data.statusInfo)
                             this.$toastr('success', response.data.message)
                         }
                     })
             },
             // Displays domain status information
             parseStatusInfo(info) {
                 this.statusProcess = info.process
                 this.isReady = info.isReady
 
                 // Update status process info every 10 seconds
                 // FIXME: This probably should have some limit, or the interval
                 //        should grow (well, until it could be done with websocket notifications)
                 if (!info.isReady) {
                     window.domainRequest = setTimeout(() => {
                         axios.get('/api/v4/domains/' + this.domain_id)
                             .then(response => {
                                 this.domain = response.data
                                 this.parseStatusInfo(this.domain.statusInfo)
                             })
                             .catch(error => {
                                 this.parseStatusInfo(info)
                             })
                     }, 10000);
                 }
             },
         }
     }
 </script>