diff --git a/client/src/app/install/install-step-4-user-system.js b/client/src/app/install/install-step-4-user-system.js
index 5a33296b..bc85162a 100644
--- a/client/src/app/install/install-step-4-user-system.js
+++ b/client/src/app/install/install-step-4-user-system.js
@@ -56,8 +56,8 @@ class InstallStep4UserSystem extends React.Component {
             path: '/system/init-settings',
             data: {
                 'language': this.props.language,
-                'user-system-enabled': form['user-system-enabled'],
-                'registration': form['registration']
+                'user-system-enabled': form['user-system-enabled'] * 1,
+                'registration': form['registration'] * 1
             }
         }).then(() => browserHistory.push('/install/step-5'));
     }
diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php
index 45f889ff..21b000ff 100644
--- a/server/controllers/system/init-settings.php
+++ b/server/controllers/system/init-settings.php
@@ -48,8 +48,8 @@ class InitSettingsController extends Controller {
             'max-size' => 1024,
             'title' => 'Support Center',
             'url' => 'http://dev3.opensupports.com',
-            'registration' => Controller::request('registration'),
-            'user-system-enabled' => Controller::request('user-system-enabled'),
+            'registration' => !!Controller::request('registration'),
+            'user-system-enabled' => !!Controller::request('user-system-enabled'),
             'last-stat-day' => date('YmdHi', strtotime(' -12 day ')),
             'ticket-gap' => Hashing::generateRandomPrime(100000, 999999),
             'file-gap' => Hashing::generateRandomPrime(100000, 999999),
diff --git a/server/data/mail-templates/user-signup-en.html b/server/data/mail-templates/user-signup-en.html
index e7cfc4cb..e2b5833b 100644
--- a/server/data/mail-templates/user-signup-en.html
+++ b/server/data/mail-templates/user-signup-en.html
@@ -340,7 +340,7 @@
                                         <table cellpadding="0" cellspacing="0" width="100%">
                                             <tr>
                                                 <td style="padding-bottom: 30px;">
-                                                    Use this code in {{url}}/verify-token or click the button below.
+                                                    Use this code in {{url}}/verify-token/{{email}}/{{verificationToken}} or click the button below.
                                                 </td>
                                             </tr>
                                             <tr>
@@ -351,7 +351,7 @@
                                             <tr>
                                                 <td class="button">
                                                     <div><!--[if mso]>
-                                                        <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="http://" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
+                                                        <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/verify-token/{{to}}/{{verificationToken}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
                                                             <w:anchorlock/>
                                                             <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Shop Now</center>
                                                         </v:roundrect>
diff --git a/server/libs/MailSender.php b/server/libs/MailSender.php
index 82570b19..65cd9bab 100644
--- a/server/libs/MailSender.php
+++ b/server/libs/MailSender.php
@@ -5,7 +5,8 @@ class MailSender {
     
     public function __construct() {
         $this->mailOptions['from'] = Setting::getSetting('no-reply-email')->value;
-        
+        $this->mailOptions['fromName'] = 'OpenSupports';
+
         $this->mailOptions['smtp-host'] = Setting::getSetting('smtp-host')->value;
         $this->mailOptions['smtp-port'] = Setting::getSetting('smtp-port')->value;
         $this->mailOptions['smtp-user'] = Setting::getSetting('smtp-user')->value;
@@ -23,6 +24,7 @@ class MailSender {
         $mailer = new PHPMailer();
 
         $mailer->From = $this->mailOptions['from'];
+        $mailer->FromName = $this->mailOptions['fromName'];
         $mailer->addAddress($this->mailOptions['to']);
         $mailer->Subject = $this->mailOptions['subject'];
         $mailer->Body = $this->mailOptions['body'];