diff --git a/public/installer/Email.php b/public/installer/Email.php
index a05ed1a67..800397aed 100644
--- a/public/installer/Email.php
+++ b/public/installer/Email.php
@@ -21,6 +21,7 @@
                         <select name="mail_encryption" class="control">
                             <option value="ssl">SSL</option>
                             <option value="tls">TLS</option>
+                            <option value="">None</option>
                         </select>
                     </div>
 
diff --git a/public/installer/EmailConfig.php b/public/installer/EmailConfig.php
index c1e43e8bf..ec82d3012 100644
--- a/public/installer/EmailConfig.php
+++ b/public/installer/EmailConfig.php
@@ -27,6 +27,9 @@ $data = array();
     if (empty($_POST['mail_username']))
         $errors['mail_username'] = 'Please enter your email address or username.';
 
+    if (preg_match('/\s/', $_POST['mail_username']))
+        $errors['mail_username'] = 'There should be no space in Username.';
+
     if (empty($_POST['mail_password']))
         $errors['mail_password'] = 'Please enter the password for this email address.';
 
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 1d0b4077e..e46a284a8 100755
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -52,13 +52,12 @@
 @slot('subcopy')
 @lang(
     "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
-    'into your web browser: [:displayableActionUrl](:actionURL)',
+    'into your web browser: [:actionURL](:actionURL)',
     [
         'actionText' => $actionText,
         'actionURL' => $actionUrl,
-        'displayableActionUrl' => $displayableActionUrl,
     ]
 )
 @endslot
 @endisset
-@endcomponent
\ No newline at end of file
+@endcomponent