diff --git a/.env.example b/.env.example
index 7f663f05f..6c3635099 100644
--- a/.env.example
+++ b/.env.example
@@ -21,6 +21,7 @@ DB_HOST=localhost
 DB_PORT=3306
 DB_DATABASE=
 DB_USERNAME=
+# Maximum password length is 50 characters
 DB_PASSWORD=
 
 # Run the following console command to generate the key: php artisan key:generate
diff --git a/README.md b/README.md
index fe5127450..1892183b0 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Need anything else? Suggest features [here](https://feedback.userreport.com/25a3
 
 ## Demo
 
-[Live demo](https://demo.freescout.net)
+**[Live Demo](https://demo.freescout.net)**
 
 ## Mobile Apps
 
diff --git a/config/app.php b/config/app.php
index 8812b4266..4326b83c0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -12,7 +12,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.3.17',
+    'version' => '1.3.18',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/database/migrations/2019_12_10_0856000_add_before_reply_column_to_mailboxes_table.php b/database/migrations/2019_12_10_0856000_add_before_reply_column_to_mailboxes_table.php
index 8ad107a25..814588d39 100644
--- a/database/migrations/2019_12_10_0856000_add_before_reply_column_to_mailboxes_table.php
+++ b/database/migrations/2019_12_10_0856000_add_before_reply_column_to_mailboxes_table.php
@@ -16,7 +16,7 @@ public function up()
         // To avoid 'Row size too large' error.
         // https://github.com/freescout-helpdesk/freescout/issues/393
         // https://dev.mysql.com/doc/refman/8.0/en/column-count-limit.html
-        if (version_compare(config('app.version'), '1.3.17', '<')) {
+        if (version_compare(config('app.version'), '1.3.18', '<=')) {
             Schema::table('mailboxes', function (Blueprint $table) {
                 $table->text('out_password')->nullable()->change();
                 $table->text('in_password')->nullable()->change();
@@ -38,12 +38,5 @@ public function down()
         Schema::table('mailboxes', function (Blueprint $table) {
             $table->dropColumn('before_reply');
         });
-
-        if (version_compare(config('app.version'), '1.3.17', '<')) {
-            Schema::table('mailboxes', function (Blueprint $table) {
-                $table->string('out_password', 255)->nullable()->change();
-                $table->string('in_password', 512)->nullable()->change();
-            });
-        }
     }
 }
diff --git a/database/migrations/2019_12_22_111025_change_passwords_types_in_mailboxes_table.php b/database/migrations/2019_12_22_111025_change_passwords_types_in_mailboxes_table.php
new file mode 100644
index 000000000..b87ee202a
--- /dev/null
+++ b/database/migrations/2019_12_22_111025_change_passwords_types_in_mailboxes_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangePasswordsTypesInMailboxesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // To avoid 'Row size too large' error.
+        // https://github.com/freescout-helpdesk/freescout/issues/393
+        // https://dev.mysql.com/doc/refman/8.0/en/column-count-limit.html
+        Schema::table('mailboxes', function (Blueprint $table) {
+            $table->text('out_password')->nullable()->change();
+            $table->text('in_password')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}
diff --git a/resources/views/vendor/installer/environment-wizard.blade.php b/resources/views/vendor/installer/environment-wizard.blade.php
index 1391ca5ba..612eddae1 100644
--- a/resources/views/vendor/installer/environment-wizard.blade.php
+++ b/resources/views/vendor/installer/environment-wizard.blade.php
@@ -167,6 +167,7 @@
                         Password
                     </label>
                     <input type="text" name="database_password" id="database_password" value="{{ old('database_password', env('DB_PASSWORD')) }}" maxlength="50"/>
+                    <span style="color: #AAAAAA; position: relative; top: -5px;">(Maximum password length is 50 characters)</span>
                     @if ($errors->has('database_password'))
                         <span class="error-block">
                             <i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>