diff --git a/app/BaseModel.php b/app/BaseModel.php
index 84f6630cc..fc20a21ed 100644
--- a/app/BaseModel.php
+++ b/app/BaseModel.php
@@ -17,18 +17,18 @@ class BaseModel extends Model
 {
     public function setAttribute($property, $value)
     {
-        require_once base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php');
-        $path = base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier'.DIRECTORY_SEPARATOR.'DefinitionCache'.DIRECTORY_SEPARATOR.'Serializer');
-        if (!File::exists($path)) {
-            File::makeDirectory($path, $mode = 0777, true, true);
-        }
-        $config = \HTMLPurifier_Config::createDefault();
-        $config->set('HTML.Trusted', true);
-        $config->set('Filter.YouTube', true);
-        $purifier = new \HTMLPurifier($config);
-        if ($value != strip_tags($value)) {
-            $value = $purifier->purify($value);
-        }
+//        require_once base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php');
+//        $path = base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier'.DIRECTORY_SEPARATOR.'DefinitionCache'.DIRECTORY_SEPARATOR.'Serializer');
+//        if (!File::exists($path)) {
+//            File::makeDirectory($path, $mode = 0777, true, true);
+//        }
+//        $config = \HTMLPurifier_Config::createDefault();
+//        $config->set('HTML.Trusted', true);
+//        $config->set('Filter.YouTube', true);
+//        $purifier = new \HTMLPurifier($config);
+//        if ($value != strip_tags($value)) {
+//            $value = $purifier->purify($value);
+//        }
         parent::setAttribute($property, $value);
     }
 }
diff --git a/app/Console/Commands/DropTables.php b/app/Console/Commands/DropTables.php
new file mode 100644
index 000000000..efbdc2413
--- /dev/null
+++ b/app/Console/Commands/DropTables.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands;
+
+use DB;
+use Illuminate\Console\Command;
+
+class DropTables extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'droptables';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Drops all tables';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $colname = 'Tables_in_'.env('DB_DATABASE');
+
+        $droplist = \Schema::getConnection()->getDoctrineSchemaManager()->listTableNames();
+        $droplist = implode(',', $droplist);
+
+        DB::beginTransaction();
+        //turn off referential integrity
+        DB::statement('SET FOREIGN_KEY_CHECKS = 0');
+        DB::statement("DROP TABLE $droplist");
+        //turn referential integrity back on
+        DB::statement('SET FOREIGN_KEY_CHECKS = 1');
+        DB::commit();
+
+        $this->comment(PHP_EOL.'If no errors showed up, all tables were dropped'.PHP_EOL);
+    }
+}
diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php
new file mode 100644
index 000000000..579a4f57d
--- /dev/null
+++ b/app/Console/Commands/Install.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Http\Controllers\Installer\helpdesk\InstallController;
+use Illuminate\Console\Command;
+
+class Install extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'install:faveo';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'to install faveo';
+    protected $install;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->install = new InstallController();
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        try {
+            $this->appEnv();
+            if ($this->confirm('Do you want to intall faveo?')) {
+                $default = $this->choice(
+                            'Which sql engine would you like to use?', ['mysql']
+                    );
+                $host = $this->ask('Enter your sql host');
+                $database = $this->ask('Enter your database name');
+                $dbusername = $this->ask('Enter your database username');
+                $dbpassword = $this->ask('Enter your database password (blank if not entered)', false);
+                $port = $this->ask('Enter your sql port (blank if not entered)', false);
+                $this->install->env($default, $host, $port, $database, $dbusername, $dbpassword);
+                $this->info('.env file has created');
+                $this->call('preinsatall:check');
+                $this->alert("please run 'php artisan install:db'");
+            } else {
+                $this->info('We hope, you will try next time');
+            }
+        } catch (\Exception $ex) {
+            $this->error($ex->getMessage());
+        }
+    }
+
+    public function appEnv()
+    {
+        $extensions = [
+            'curl',
+            'ctype',
+            'imap',
+            'mbstring',
+            'mcrypt',
+            'mysql',
+            'openssl',
+            'tokenizer',
+            'zip',
+            'pdo',
+            'mysqli',
+            'bcmath',
+            'iconv',
+                //'ioncube_loader_dar_5.6',
+        ];
+        $result = [];
+        foreach ($extensions as $key => $extension) {
+            $result[$key]['extension'] = $extension;
+            if (!extension_loaded($extension)) {
+                $result[$key]['status'] = "Not Loading, Please open '".php_ini_loaded_file()."' and add 'extension = ".$extension;
+            } else {
+                $result[$key]['status'] = 'Loading';
+            }
+        }
+        $result['php']['extension'] = 'PHP';
+        if (phpversion() === 7.0) {
+            $result['php']['status'] = 'PHP version supports';
+        } else {
+            $result['php']['status'] = "PHP version doesn't supports please upgrade to 7.0";
+        }
+
+        $headers = ['Extension', 'Status'];
+        $this->table($headers, $result);
+    }
+}
diff --git a/app/Console/Commands/InstallDB.php b/app/Console/Commands/InstallDB.php
new file mode 100644
index 000000000..871acfb71
--- /dev/null
+++ b/app/Console/Commands/InstallDB.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Http\Controllers\Installer\helpdesk\InstallController;
+use DB;
+use Illuminate\Console\Command;
+
+class InstallDB extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'install:db';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'installing database';
+    protected $install;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->install = new InstallController();
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        try {
+            if ($this->confirm('Do you want to migrate tables now?')) {
+                $env = base_path().DIRECTORY_SEPARATOR.'.env';
+                if (!is_file($env)) {
+                    throw new \Exception("Please run 'php artisan install:faveo'");
+                }
+                $dummy_confirm = $this->confirm('Would you like to install dummy data in database to test before going live?');
+                $this->call('key:generate', ['--force' => true]);
+                if (!$dummy_confirm) {
+                    $this->call('install:migrate');
+                    $this->call('install:seed');
+                } else {
+                    $path = base_path().'/DB/dummy-data.sql';
+                    DB::unprepared(file_get_contents($path));
+                }
+                $headers = ['user_name', 'email', 'password'];
+                $data = [
+                    [
+                        'user_name' => 'demo_admin',
+                        'email'     => '',
+                        'password'  => 'demopass',
+                    ],
+                ];
+                $this->table($headers, $data);
+                $this->warn('Please update your email and change the password immediately');
+                $this->install->updateInstalEnv();
+                $this->updateAppUrl();
+            }
+        } catch (\Exception $ex) {
+            $this->error($ex->getMessage());
+        }
+    }
+
+    public function updateAppUrl()
+    {
+        $url = $this->ask('Enter your app url (with http/https and www/non www)');
+        if (str_finish($url, '/')) {
+            $url = rtrim($url, '/ ');
+        }
+        $systems = new \App\Model\helpdesk\Settings\System();
+        $system = $systems->first();
+        $system->url = $url;
+        $system->save();
+        $this->info('Thank you! Faveo has been installed successfully');
+    }
+}
diff --git a/app/Console/Commands/UpdateEncryption.php b/app/Console/Commands/UpdateEncryption.php
new file mode 100644
index 000000000..57df323d9
--- /dev/null
+++ b/app/Console/Commands/UpdateEncryption.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UpdateEncryption extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'encryption';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This update the encryption value from old to AES-256-CBC';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $emails = \App\Model\helpdesk\Email\Emails::get();
+
+        foreach ($emails as $email) {
+            $email->password = encrypt('password');
+            $email->save();
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 3a5c7c21c..a8224a419 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -18,6 +18,10 @@ class Kernel extends ConsoleKernel
         'App\Console\Commands\SendReport',
         'App\Console\Commands\CloseWork',
         'App\Console\Commands\TicketFetch',
+        'App\Console\Commands\UpdateEncryption',
+        \App\Console\Commands\DropTables::class,
+        \App\Console\Commands\Install::class,
+        \App\Console\Commands\InstallDB::class,
     ];
 
     /**
@@ -33,9 +37,11 @@ class Kernel extends ConsoleKernel
             if ($this->getCurrentQueue() != 'sync') {
                 $schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute();
             }
+
             $this->execute($schedule, 'fetching');
             $this->execute($schedule, 'notification');
             $this->execute($schedule, 'work');
+            $schedule->command('sla-escalate')->everyThirtyMinutes();
         }
     }
 
@@ -114,4 +120,14 @@ class Kernel extends ConsoleKernel
 
         return $queue;
     }
+
+    /**
+     * Register the Closure based commands for the application.
+     *
+     * @return void
+     */
+    protected function commands()
+    {
+        require base_path('routes/console.php');
+    }
 }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 58b311947..296cbcd53 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -43,6 +43,7 @@ class Handler extends ExceptionHandler
      */
     public function report(Exception $e)
     {
+        dd($e);
         $debug = \Config::get('app.bugsnag_reporting');
         $debug = ($debug) ? 'true' : 'false';
         if ($debug == 'false') {
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 61cc14b67..bf414088e 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -22,7 +22,7 @@ use Auth;
 use DateTime;
 use DB;
 use Hash;
-use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+use Illuminate\Http\Request;
 use Lang;
 use Socialite;
 
@@ -38,7 +38,6 @@ use Socialite;
  */
 class AuthController extends Controller
 {
-    use AuthenticatesAndRegistersUsers;
     /* to redirect after login */
 
     // if auth is agent
@@ -644,4 +643,27 @@ class AuthController extends Controller
         \Session::set($provider.'redirect', $url);
         $this->changeRedirect();
     }
+
+    /**
+     * Log the user out of the application.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getLogout(Request $request)
+    {
+        \Event::fire('user.logout', []);
+        $login = new LoginController();
+
+        return $login->logout($request);
+    }
+
+    public function redirectPath()
+    {
+        $auth = Auth::user();
+        if ($auth && $auth->role != 'user') {
+            return 'dashboard';
+        } else {
+            return '/';
+        }
+    }
 }
diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php
index c1fe9ed05..ecf2975a2 100644
--- a/app/Http/Controllers/Installer/helpdesk/InstallController.php
+++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php
@@ -5,11 +5,9 @@ namespace App\Http\Controllers\Installer\helpdesk;
 // controllers
 use App\Http\Controllers\Controller;
 // requests
-use App\Http\Requests\helpdesk\DatabaseRequest;
 use App\Http\Requests\helpdesk\InstallerRequest;
 use App\Model\helpdesk\Settings\System;
 // models
-use App\Model\helpdesk\Utility\Date_time_format;
 use App\Model\helpdesk\Utility\Timezones;
 use App\User;
 use Artisan;
@@ -46,15 +44,10 @@ class InstallController extends Controller
      */
     public function licence()
     {
-        // checking if the installation is running for the first time or not
-        $directory = base_path();
-        if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
-            return redirect('/auth/login');
+        if (Cache::get('step1') == 'step1') {
+            return View::make('themes/default1/installer/helpdesk/view1');
         } else {
-            Cache::flush();
-            Artisan::call('config:clear');
-
-            return view('themes/default1/installer/helpdesk/view1');
+            return Redirect::route('prerequisites');
         }
     }
 
@@ -66,11 +59,10 @@ class InstallController extends Controller
     public function licencecheck(Request $request)
     {
         // checking if the user have accepted the licence agreement
-        $accept = (Input::has('accept1')) ? true : false;
-        if ($accept == 'accept') {
-            Cache::forever('step1', 'step1');
+        if (Input::has('acceptme')) {
+            Cache::forever('step2', 'step2');
 
-            return Redirect::route('prerequisites');
+            return Redirect::route('configuration');
         } else {
             return Redirect::route('licence')->with('fails', 'Failed! first accept the licence agreeement');
         }
@@ -87,10 +79,14 @@ class InstallController extends Controller
     public function prerequisites(Request $request)
     {
         // checking if the installation is running for the first time or not
-        if (Cache::get('step1') == 'step1') {
-            return View::make('themes/default1/installer/helpdesk/view2');
+        $directory = base_path();
+        if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
+            return redirect('/auth/login');
         } else {
-            return Redirect::route('licence');
+            Cache::flush();
+            Artisan::call('config:clear');
+
+            return view('themes/default1/installer/helpdesk/view2');
         }
     }
 
@@ -102,9 +98,9 @@ class InstallController extends Controller
      */
     public function prerequisitescheck(Request $request)
     {
-        Cache::forever('step2', 'step2');
+        Cache::forever('step1', 'step1');
 
-        return Redirect::route('configuration');
+        return Redirect::route('licence');
     }
 
     /**
@@ -164,69 +160,25 @@ class InstallController extends Controller
      *
      * @return type view
      */
-    public function configurationcheck(DatabaseRequest $request)
+    public function configurationcheck(Request $request)
     {
         Cache::forever('step4', 'step4');
 
-        Session::set('default', $request->input('default'));
-        Session::set('host', $request->input('host'));
-        Session::set('databasename', $request->input('databasename'));
-        Session::set('username', $request->input('username'));
-        Session::set('password', $request->input('password'));
-        Session::set('port', $request->input('port'));
+        Session::put('default', $request->input('default'));
+        Session::put('host', $request->input('host'));
+        Session::put('databasename', $request->input('databasename'));
+        Session::put('username', $request->input('username'));
+        Session::put('password', $request->input('password'));
+        Session::put('port', $request->input('port'));
+        Cache::forever('dummy_data_installation', false);
+        if ($request->has('dummy-data')) {
+            Cache::forget('dummy_data_installation');
+            Cache::forever('dummy_data_installation', true);
+        }
 
         return Redirect::route('database');
     }
 
-    /**
-     * postconnection.
-     *
-     * @return type view
-     */
-    public function postconnection(Request $request)
-    {
-        error_reporting(E_ALL & ~E_NOTICE);
-        $default = Input::get('default');
-        $host = Input::get('host');
-        $database = Input::get('databasename');
-        $dbusername = Input::get('username');
-        $dbpassword = Input::get('password');
-        $port = Input::get('port');
-
-        $ENV['APP_ENV'] = 'production';
-        $ENV['APP_DEBUG'] = 'false';
-        $ENV['APP_KEY'] = 'SomeRandomString';
-        $ENV['APP_BUGSNAG'] = 'true';
-        $ENV['APP_URL'] = 'http://localhost';
-        $ENV['DB_INSTALL'] = '%0%';
-        $ENV['DB_TYPE'] = $default;
-        $ENV['DB_HOST'] = $host;
-        $ENV['DB_PORT'] = $port;
-        $ENV['DB_DATABASE'] = $database;
-        $ENV['DB_USERNAME'] = $dbusername;
-        $ENV['DB_PASSWORD'] = $dbpassword;
-        $ENV['MAIL_DRIVER'] = 'smtp';
-        $ENV['MAIL_HOST'] = 'mailtrap.io';
-        $ENV['MAIL_PORT'] = '2525';
-        $ENV['MAIL_USERNAME'] = 'null';
-        $ENV['MAIL_PASSWORD'] = 'null';
-        $ENV['CACHE_DRIVER'] = 'file';
-        $ENV['SESSION_DRIVER'] = 'file';
-        $ENV['QUEUE_DRIVER'] = 'sync';
-
-        $config = '';
-        foreach ($ENV as $key => $val) {
-            $config .= "{$key}={$val}\n";
-        }
-        // Write environment file
-        $fp = fopen(base_path().DIRECTORY_SEPARATOR.'example.env', 'w');
-        fwrite($fp, $config);
-        fclose($fp);
-        rename(base_path().DIRECTORY_SEPARATOR.'example.env', base_path().DIRECTORY_SEPARATOR.'.env');
-
-        return 1;
-    }
-
     /**
      * Get database
      * checking prerequisites.
@@ -269,28 +221,24 @@ class InstallController extends Controller
      *
      * @return type view
      */
-    public function accountcheck(InstallerRequest $request)
+    public function accountcheck(Request $request)
     {
-        // checking is the installation was done previously
-        try {
-            $check_for_pre_installation = System::all();
-            if ($check_for_pre_installation) {
-                rename(base_path().DIRECTORY_SEPARATOR.'.env', base_path().DIRECTORY_SEPARATOR.'example.env');
-                Cache::put('fails', 'The data in database already exist. Please provide fresh database', 2);
+        $validator = \Validator::make($request->all(), [
+                    'firstname'       => 'required|max:20',
+                    'Lastname'        => 'required|max:20',
+                    'email'           => 'required|max:50|email',
+                    'username'        => 'required|max:50|min:3',
+                    'password'        => 'required|min:6',
+                    'confirmpassword' => 'required|same:password',
+        ]);
 
-                return redirect()->route('configuration');
-            }
-        } catch (Exception $e) {
+        if ($validator->fails()) {
+            return redirect('step5')
+                            ->withErrors($validator)
+                            ->withInput();
         }
-        if ($request->input('dummy-data') == 'on') {
-            $path = base_path().'/DB/dummy-data.sql';
-            DB::unprepared(file_get_contents($path));
-        } else {
-            // migrate database
-            Artisan::call('migrate', ['--force' => true]);
-            Artisan::call('db:seed', ['--force' => true]);
-        }
-        // create user
+        // checking is the installation was done previously
+        // Set variables fetched from input request
         $firstname = $request->input('firstname');
         $lastname = $request->input('Lastname');
         $email = $request->input('email');
@@ -301,46 +249,49 @@ class InstallController extends Controller
         $timezone = $request->input('timezone');
         $date = $request->input('date');
         $datetime = $request->input('datetime');
+        $lang_path = base_path('resources/lang');
+
+        //check user input language package is available or not in the system
+        if (array_key_exists($language, \Config::get('languages')) && in_array($language, scandir($lang_path))) {
+            // do something here
+        } else {
+            return \Redirect::back()->with('fails', 'Invalid language');
+        }
+
         $changed = UnAuth::changeLanguage($language);
         if (!$changed) {
             return \Redirect::back()->with('fails', 'Invalid language');
         }
-        // checking requested timezone for the admin and system
-        $timezones = Timezones::where('name', '=', $timezone)->first();
-        if ($timezones == null) {
-            return redirect()->back()->with('fails', 'Invalid time-zone');
-        }
 
-        // checking requested date time format for the admin and system
-        $date_time_format = Date_time_format::where('format', '=', $datetime)->first();
-        if ($date_time_format == null) {
-            return redirect()->back()->with('fails', 'invalid date-time format');
-        }
-
-        // Creating minum settings for system
-        $system = new System();
+        $system = System::where('id', '=', 1)->first();
         $system->status = 1;
         $system->department = 1;
-        $system->date_time_format = $date_time_format->id;
-        $system->time_zone = $timezones->id;
-        $version = \Config::get('app.version');
-        $version = explode(' ', $version);
-        $version = $version[1];
+        $system->date_time_format = $datetime; //$date_time_format->id;
+        $system->time_zone = $timezone; //$timezones->id;
+        $version = \Config::get('app.tags');
+        // $version = explode(' ', $version);
+        // $version = $version[1];
         $system->version = $version;
         $system->save();
 
+        $admin_tzone = 14;
+        $tzone = Timezones::select('id')->where('name', '=', $timezone)->first();
+        if ($tzone) {
+            $admin_tzone = $tzone->id;
+        }
         // creating an user
-        $user = User::create([
+        $user = User::updateOrCreate(['id' => 1], [
                     'first_name'   => $firstname,
                     'last_name'    => $lastname,
                     'email'        => $email,
                     'user_name'    => $username,
                     'password'     => Hash::make($password),
-                    'assign_group' => 1,
+                    //'assign_group' => 1,
                     'primary_dpt'  => 1,
                     'active'       => 1,
                     'role'         => 'admin',
         ]);
+
         // checking if the user have been created
         if ($user) {
             Cache::forever('step6', 'step6');
@@ -359,34 +310,20 @@ class InstallController extends Controller
     {
         // checking if the installation have been completed or not
         if (Cache::get('step6') == 'step6') {
-            $value = '1';
-            $install = base_path().DIRECTORY_SEPARATOR.'.env';
-            $datacontent = File::get($install);
-            $datacontent = str_replace('%0%', $value, $datacontent);
-            File::put($install, $datacontent);
-            // setting email settings in route
-            $smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
-
-            $link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
-            $pos = strpos($link, 'final');
-            $link = substr($link, 0, $pos);
-            $app_url = base_path().DIRECTORY_SEPARATOR.'.env';
-            $datacontent2 = File::get($app_url);
-            $datacontent2 = str_replace('http://localhost', $link, $datacontent2);
-            File::put($app_url, $datacontent2);
             $language = Cache::get('language');
 
             try {
-                Cache::flush();
-
-                Artisan::call('key:generate');
+                \Cache::flush();
                 \Cache::forever('language', $language);
+                $this->updateInstalEnv();
 
                 return View::make('themes/default1/installer/helpdesk/view6');
             } catch (Exception $e) {
                 return Redirect::route('account')->with('fails', $e->getMessage());
             }
         } else {
+            $this->updateInstalEnv();
+
             return redirect('/auth/login');
         }
     }
@@ -400,9 +337,11 @@ class InstallController extends Controller
     public function finalcheck()
     {
         try {
+            $this->updateInstalEnv();
+
             return redirect('/auth/login');
         } catch (Exception $e) {
-            return redirect('/auth/login');
+            return redirect('/auth/login')->with('fails', $e->getMessage());
         }
     }
 
@@ -414,10 +353,16 @@ class InstallController extends Controller
             if ($f1 >= '644') {
                 return Redirect::back();
             } else {
-                return Redirect::back()->with('fail_to_change', 'We are unable to change file permission on your server please try to change permission manually.');
+                return Redirect::back()->with(
+                    'fail_to_change',
+                    'We are unable to change file permission on your server please try to change permission manually.'
+                );
             }
         } else {
-            return Redirect::back()->with('fail_to_change', 'We are unable to change file permission on your server please try to change permission manually.');
+            return Redirect::back()->with(
+                'fail_to_change',
+                'We are unable to change file permission on your server please try to change permission manually.'
+            );
         }
     }
 
@@ -425,4 +370,198 @@ class InstallController extends Controller
     {
         return view('themes/default1/installer/helpdesk/check-js')->with('url', 'step1');
     }
+
+    public function createEnv($api = true)
+    {
+        try {
+            if (Input::get('default')) {
+                $default = Input::get('default');
+            } else {
+                $default = Session::get('default');
+            }
+            if (Input::get('host')) {
+                $host = Input::get('host');
+            } else {
+                $host = Session::get('host');
+            }
+            if (Input::get('databasename')) {
+                $database = Input::get('databasename');
+            } else {
+                $database = Session::get('databasename');
+            }
+            if (Input::get('username')) {
+                $dbusername = Input::get('username');
+            } else {
+                $dbusername = Session::get('username');
+            }
+            if (Input::get('password')) {
+                $dbpassword = Input::get('password');
+            } else {
+                $dbpassword = Session::get('password');
+            }
+            if (Input::get('port')) {
+                $port = Input::get('port');
+            } else {
+                $port = Session::get('port');
+            }
+            $this->env($default, $host, $port, $database, $dbusername, $dbpassword);
+        } catch (Exception $ex) {
+            $result = ['error' => $ex->getMessage()];
+
+            return response()->json(compact('result'), 500);
+        }
+        if ($api) {
+            $url = url('preinstall/check');
+            $result = ['success' => 'Environment configuration file has been created successfully', 'next' => 'Running pre migration test', 'api' => $url];
+
+            return response()->json(compact('result'));
+        }
+    }
+
+    public function env($default, $host, $port, $database, $dbusername, $dbpassword)
+    {
+        $ENV['APP_DEBUG'] = 'false';
+        $ENV['APP_BUGSNAG'] = 'true';
+        $ENV['APP_URL'] = url('/');
+        $ENV['DB_TYPE'] = $default;
+        $ENV['DB_HOST'] = '"'.$host.'"';
+        $ENV['DB_PORT'] = '"'.$port.'"';
+        $ENV['DB_DATABASE'] = '"'.$database.'"';
+        $ENV['DB_USERNAME'] = '"'.$dbusername.'"';
+        $ENV['DB_PASSWORD'] = '"'.$dbpassword.'"';
+        $ENV['MAIL_DRIVER'] = 'smtp';
+        $ENV['MAIL_HOST'] = 'mailtrap.io';
+        $ENV['MAIL_PORT'] = '2525';
+        $ENV['MAIL_USERNAME'] = 'null';
+        $ENV['MAIL_PASSWORD'] = 'null';
+        $ENV['CACHE_DRIVER'] = 'file';
+        $ENV['SESSION_DRIVER'] = 'file';
+        $ENV['SESSION_COOKIE_NAME'] = 'faveo_'.rand(0, 10000);
+        $ENV['QUEUE_DRIVER'] = 'sync';
+
+        $ENV['FCM_SERVER_KEY'] = 'AIzaSyCyx5OFnsRFUmDLTMbPV50ZMDUGSG-bLw4';
+        $ENV['FCM_SENDER_ID'] = '661051343223';
+        $ENV['REDIS_DATABASE'] = '0';
+
+        $config = '';
+        foreach ($ENV as $key => $val) {
+            $config .= "{$key}={$val}\n";
+        }
+        if (is_file(base_path().DIRECTORY_SEPARATOR.'.env')) {
+            unlink(base_path().DIRECTORY_SEPARATOR.'.env');
+        }
+        if (!is_file(base_path().DIRECTORY_SEPARATOR.'example.env')) {
+            fopen(base_path().DIRECTORY_SEPARATOR.'example.env', 'w');
+        }
+
+        // Write environment file
+        $fp = fopen(base_path().DIRECTORY_SEPARATOR.'example.env', 'w');
+        fwrite($fp, $config);
+        fclose($fp);
+        rename(base_path().DIRECTORY_SEPARATOR.'example.env', base_path().DIRECTORY_SEPARATOR.'.env');
+    }
+
+    public function checkPreInstall()
+    {
+        try {
+            $check_for_pre_installation = System::select('id')->first();
+            if ($check_for_pre_installation) {
+                throw new Exception('This database already has tables and data. Please provide fresh database', 100);
+            }
+        } catch (Exception $ex) {
+            if ($ex->getCode() == 100) {
+                Artisan::call('droptables');
+                $this->createEnv(false);
+            }
+        }
+        Artisan::call('key:generate', ['--force' => true]);
+
+        $url = url('migrate');
+        $result = ['success' => 'Pre migration test has run successfully', 'next' => 'Migrating tables in database', 'api' => $url];
+
+        return response()->json(compact('result'));
+    }
+
+    public function migrate()
+    {
+        $db_install_method = '';
+
+        try {
+            $tableNames = \Schema::getConnection()->getDoctrineSchemaManager()->listTableNames();
+            if (count($tableNames) === 0) {
+                if (!Cache::get('dummy_data_installation')) {
+                    Artisan::call('migrate', ['--force' => true]);
+                    $db_install_method = 'migrate';
+                } else {
+                    $path = base_path().DIRECTORY_SEPARATOR.'DB'.DIRECTORY_SEPARATOR.'dummy-data.sql';
+                    DB::unprepared(file_get_contents($path));
+                    $db_install_method = 'dump';
+                }
+            }
+        } catch (Exception $ex) {
+            $this->rollBackMigration();
+            $result = ['error' => $ex->getMessage()];
+
+            return response()->json(compact('result'), 500);
+        }
+        $url = ($db_install_method == 'migrate') ? url('seed') : '';
+        $message = ($db_install_method == 'migrate') ? 'Tables have been migrated successfully in database.' : 'Database has been setup successfully.';
+        $result = ['success' => $message, 'next' => 'Seeding pre configurations data', 'api' => $url];
+
+        return response()->json(compact('result'));
+    }
+
+    public function rollBackMigration()
+    {
+        try {
+            Artisan::call('migrate:reset', ['--force' => true]);
+        } catch (Exception $ex) {
+            $result = ['error' => $ex->getMessage()];
+
+            return response()->json(compact('result'), 500);
+        }
+    }
+
+    public function seed(Request $request)
+    {
+        try {
+            if ($request->input('dummy-data') == 'on') {
+                $path = base_path().'/DB/dummy-data.sql';
+                DB::unprepared(DB::raw(file_get_contents($path)));
+            } else {
+                \Schema::disableForeignKeyConstraints();
+                $tableNames = \Schema::getConnection()->getDoctrineSchemaManager()->listTableNames();
+                foreach ($tableNames as $name) {
+                    //if you don't want to truncate migrations
+                    if ($name == 'migrations') {
+                        continue;
+                    }
+                    DB::table($name)->truncate();
+                }
+                Artisan::call('db:seed', ['--force' => true]);
+            }
+            //$this->updateInstalEnv();
+        } catch (Exception $ex) {
+            $result = ['error' => $ex->getMessage()];
+
+            return response()->json(compact('result'), 500);
+        }
+        $result = ['success' => 'Database has been setup successfully.'];
+
+        return response()->json(compact('result'));
+    }
+
+    public function updateInstalEnv()
+    {
+        $env = base_path().DIRECTORY_SEPARATOR.'.env';
+        if (is_file($env)) {
+            $txt = 'DB_INSTALL=1';
+            $txt1 = 'APP_ENV=development';
+            file_put_contents($env, $txt.PHP_EOL, FILE_APPEND | LOCK_EX);
+            file_put_contents($env, $txt1, FILE_APPEND | LOCK_EX);
+        } else {
+            throw new Exception('.env not found');
+        }
+        Artisan::call('jwt:secret');
+    }
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 6d267b2aa..ad44346df 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -34,9 +34,11 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \App\Http\Middleware\LanguageMiddleware::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
         'api' => [
             'throttle:60,1',
+            'bindings',
         ],
     ];
 
@@ -46,19 +48,23 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth'        => \App\Http\Middleware\Authenticate::class,
-        'auth.basic'  => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'can'         => \Illuminate\Foundation\Http\Middleware\Authorize::class,
-        'guest'       => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle'    => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'roles'       => \App\Http\Middleware\CheckRole::class,
-        'role.agent'  => \App\Http\Middleware\CheckRoleAgent::class,
-        'role.user'   => \App\Http\Middleware\CheckRoleUser::class,
-        'api'         => \App\Http\Middleware\ApiKey::class,
-        'jwt.auth'    => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
-        'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class,
-        'update'      => \App\Http\Middleware\CheckUpdate::class,
-        'board'       => \App\Http\Middleware\CheckBoard::class,
-        'install'     => \App\Http\Middleware\Install::class,
+        'auth'         => \App\Http\Middleware\Authenticate::class,
+        'auth.basic'   => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'can'          => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest'        => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'throttle'     => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'roles'        => \App\Http\Middleware\CheckRole::class,
+        'role.agent'   => \App\Http\Middleware\CheckRoleAgent::class,
+        'role.user'    => \App\Http\Middleware\CheckRoleUser::class,
+        'api'          => \App\Http\Middleware\ApiKey::class,
+        'jwt.auth'     => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
+        'jwt.refresh'  => \Tymon\JWTAuth\Middleware\RefreshToken::class,
+        'update'       => \App\Http\Middleware\CheckUpdate::class,
+        'board'        => \App\Http\Middleware\CheckBoard::class,
+        'install'      => \App\Http\Middleware\Install::class,
+        'redirect'     => \App\Http\Middleware\Redirect::class,
+        'bindings'     => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'installer'    => \App\Http\Middleware\IsInstalled::class,
+        'force.option' => \App\Http\Middleware\TicketViewURL::class,
     ];
 }
diff --git a/app/Http/Middleware/CheckRoleAgent.php b/app/Http/Middleware/CheckRoleAgent.php
index 6c9a268af..e2e73012a 100644
--- a/app/Http/Middleware/CheckRoleAgent.php
+++ b/app/Http/Middleware/CheckRoleAgent.php
@@ -25,6 +25,6 @@ class CheckRoleAgent
             return $next($request);
         }
 
-        return redirect('dashboard')->with('fails', 'You are not Authorised');
+        return redirect('dashboard')->with('fails', 'You are not Autherised');
     }
 }
diff --git a/app/Http/Middleware/IsInstalled.php b/app/Http/Middleware/IsInstalled.php
new file mode 100644
index 000000000..bfe862801
--- /dev/null
+++ b/app/Http/Middleware/IsInstalled.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class IsInstalled
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (!isInstall()) {
+            return $next($request);
+        } else {
+            if ($request->isJson()) {
+                $url = url('/');
+                $result = ['fails' => 'already installed', 'api' => $url];
+
+                return response()->json(compact('result'));
+            } else {
+                return redirect('/');
+            }
+        }
+    }
+}
diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php
index 68ff43c33..7a153e900 100644
--- a/app/Http/Middleware/LanguageMiddleware.php
+++ b/app/Http/Middleware/LanguageMiddleware.php
@@ -4,20 +4,44 @@ namespace App\Http\Middleware;
 
 use Cache;
 use Closure;
-// use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Support\Facades\App;
+// use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Support\Facades\Config;
+use Session;
 
 class LanguageMiddleware
 {
     public function handle($request, Closure $next)
     {
-        if (Cache::has('language') and array_key_exists(Cache::get('language'), Config::get('languages'))) {
-            App::setLocale(Cache::get('language'));
+        $lang = '';
+        if (\Auth::check()) {
+            if (\Auth::user()->user_language != null) {
+                $lang = \Auth::user()->user_language;
+            } else {
+                $lang = $this->getLangFromSessionOrCache();
+            }
+        } else {
+            $lang = $this->getLangFromSessionOrCache();
+        }
+
+        if ($lang != '' and array_key_exists($lang, Config::get('languages'))) {
+            App::setLocale($lang);
         } else { // This is optional as Laravel will automatically set the fallback language if there is none specified
             App::setLocale(Config::get('app.fallback_locale'));
         }
 
         return $next($request);
     }
+
+    public function getLangFromSessionOrCache()
+    {
+        $lang = '';
+        if (Session::has('language')) {
+            $lang = Session::get('language');
+        } elseif (Cache::has('language')) {
+            $lang = Cache::get('language');
+        }
+
+        return $lang;
+    }
 }
diff --git a/app/Http/Middleware/Redirect.php b/app/Http/Middleware/Redirect.php
new file mode 100644
index 000000000..e250d76cc
--- /dev/null
+++ b/app/Http/Middleware/Redirect.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class Redirect
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $root = $request->root(); //http://localhost/faveo/Faveo-Helpdesk-Pro-fork/public
+        $url = $this->setAppUrl($request);
+        if ($url == $root) {
+            return $next($request);
+        }
+        $seg = '';
+        $segments = $request->segments();
+        if (count($segments) > 0) {
+            foreach ($segments as $segment) {
+                $seg .= '/'.$segment;
+            }
+        }
+        $url = $url.$seg;
+
+        return redirect($url);
+    }
+
+    public function setAppUrl($request)
+    {
+        $url = $request->root();
+        if (isInstall()) {
+            $schema = new \App\Model\helpdesk\Settings\CommonSettings();
+            $row = $schema->getOptionValue('url', 'app_url', true);
+            if ($row) {
+                $url = $row->option_value;
+            }
+        }
+
+        return $url;
+    }
+}
diff --git a/app/Http/Middleware/TicketViewURL.php b/app/Http/Middleware/TicketViewURL.php
new file mode 100644
index 000000000..9d3ef90ac
--- /dev/null
+++ b/app/Http/Middleware/TicketViewURL.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Input;
+
+//use Redirect;
+
+class TicketViewURL
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // dd(\Input::all(), $request->fullUrl());
+        $request_str = $request->fullUrl();
+        if (preg_match('([^D]=)', $request_str) == 1) {
+            $request_str = str_replace('=', '%5B%5D=', $request_str);
+            $request_str = str_replace('%5B%5D%5B%5D=', '%5B%5D=', $request_str);
+        }
+        if (count(Input::all()) == 0) {
+            return \Redirect::to('tickets?show%5B%5D=inbox&departments%5B%5D=All');
+        } else {
+            if (!array_key_exists('show', Input::all()) && !array_key_exists('departments', Input::all())) {
+                return \Redirect::to($request_str.'&show%5B%5D=inbox&departments%5B%5D=All');
+            } elseif (!array_key_exists('show', Input::all()) && array_key_exists('departments', Input::all())) {
+                return \Redirect::to($request_str.'&show%5B%5D=inbox');
+            } elseif (array_key_exists('show', Input::all()) && !array_key_exists('departments', Input::all())) {
+                return \Redirect::to($request_str.'&departments%5B%5D=All');
+            } else {
+                // do nothing
+            }
+            if (preg_match('([^D]=)', $request->fullUrl()) == 1) {
+                return \Redirect::to($request_str);
+            }
+
+            return $next($request);
+        }
+    }
+}
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index a67e252cf..a9a1e2e7b 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -13,8 +13,11 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
-        'CheckSerial',
         'api/v1/*',
+        'chunk/upload',
+        'chunk/upload/public',
+        'media/files/public',
+        'media/files',
     ];
 
     /**
diff --git a/app/Http/ViewComposers/AgentLayout.php b/app/Http/ViewComposers/AgentLayout.php
index 9a5a78620..1fdef6059 100644
--- a/app/Http/ViewComposers/AgentLayout.php
+++ b/app/Http/ViewComposers/AgentLayout.php
@@ -3,7 +3,6 @@
 namespace App\Http\ViewComposers;
 
 use App\Model\helpdesk\Agent\Department;
-use App\Model\helpdesk\Email\Emails;
 use App\Model\helpdesk\Settings\Company;
 use App\Model\helpdesk\Ticket\Tickets;
 use App\User;
@@ -21,7 +20,6 @@ class AgentLayout
     protected $users;
     protected $tickets;
     protected $department;
-    protected $emails;
 
     /**
      * Create a new profile composer.
@@ -30,14 +28,13 @@ class AgentLayout
      *
      * @return void
      */
-    public function __construct(Company $company, User $users, Tickets $tickets, Department $department, Emails $emails)
+    public function __construct(Company $company, User $users, Tickets $tickets, Department $department)
     {
         $this->company = $company;
         $this->auth = Auth::user();
         $this->users = $users;
         $this->tickets = $tickets;
         $this->department = $department;
-        $this->emails = $emails;
     }
 
     /**
@@ -51,19 +48,16 @@ class AgentLayout
     {
         $notifications = \App\Http\Controllers\Common\NotificationController::getNotifications();
         $view->with([
-            'company'           => $this->company,
-            'notifications'     => $notifications,
-            'myticket'          => $this->myTicket(),
-            'unassigned'        => $this->unassigned(),
-            'followup_ticket'   => $this->followupTicket(),
-            'deleted'           => $this->deleted(),
-            'closed'            => $this->closed(),
-            'tickets'           => $this->inbox(),
-            'department'        => $this->departments(),
-            'overdues'          => $this->overdues(),
-            'due_today'         => $this->getDueToday(),
-            'is_mail_conigured' => $this->getEmailConfig(),
-            'ticket_policy'     => new \App\Policies\TicketPolicy(),
+            'company'         => $this->company,
+            'notifications'   => $notifications,
+            'myticket'        => $this->myTicket(),
+            'unassigned'      => $this->unassigned(),
+            'followup_ticket' => $this->followupTicket(),
+            'deleted'         => $this->deleted(),
+            'tickets'         => $this->inbox(),
+            'department'      => $this->departments(),
+            'overdues'        => $this->overdues(),
+            'due_today'       => $this->getDueToday(),
         ]);
     }
 
@@ -104,10 +98,10 @@ class AgentLayout
         $ticket = $this->tickets();
         if ($this->auth->role == 'admin') {
             return $ticket->where('assigned_to', $this->auth->id)
-                            ->where('status', '1');
+                    ->where('status', '1');
         } elseif ($this->auth->role == 'agent') {
             return $ticket->where('assigned_to', $this->auth->id)
-                            ->where('status', '1');
+                    ->where('status', '1');
         }
     }
 
@@ -116,13 +110,13 @@ class AgentLayout
         $ticket = $this->tickets();
         if ($this->auth->role == 'admin') {
             return $ticket->where('assigned_to', '=', null)
-                            ->where('status', '=', '1')
-                            ->select('id');
+                    ->where('status', '=', '1')
+                    ->select('id');
         } elseif ($this->auth->role == 'agent') {
             return $ticket->where('assigned_to', '=', null)
-                            ->where('status', '=', '1')
-                            ->where('dept_id', '=', $this->auth->primary_dpt)
-                            ->select('id');
+                    ->where('status', '=', '1')
+                    ->where('dept_id', '=', $this->auth->primary_dpt)
+                    ->select('id');
         }
     }
 
@@ -143,7 +137,7 @@ class AgentLayout
             return $ticket->where('status', '5')->select('id');
         } elseif ($this->auth->role == 'agent') {
             return $ticket->where('status', '5')->where('dept_id', '=', $this->auth->primary_dpt)
-                            ->select('id');
+                    ->select('id');
         }
     }
 
@@ -157,7 +151,7 @@ class AgentLayout
 
         return $table->Join('ticket_status', function ($join) {
             $join->on('ticket_status.id', '=', 'tickets.status')
-                            ->whereIn('ticket_status.id', [1, 7]);
+                        ->whereIn('ticket_status.id', [1, 7]);
         });
     }
 
@@ -200,45 +194,4 @@ class AgentLayout
                             ->whereRaw('date(duedate) = ?', [date('Y-m-d')]);
         }
     }
-
-    /**
-     * @category function to fetch closed tickets count
-     *
-     * @param null
-     *
-     * @return builder
-     */
-    public function closed()
-    {
-        $table = $this->tickets();
-        if (Auth::user()->role == 'agent') {
-            $id = Auth::user()->id;
-            $dept = DepartmentAssignAgents::where('agent_id', '=', $id)->pluck('department_id')->toArray();
-            $table = $table->whereIn('tickets.dept_id', $dept)->orWhere('assigned_to', '=', Auth::user()->id);
-
-            // $id = Auth::user()->primary_dpt;
-            // $table = $table->where('tickets.dept_id', '=', $id)->orWhere('assigned_to', '=', Auth::user()->id);
-        }
-
-        return $table->where('status', 3);
-    }
-
-    /**
-     * @category function to check configured mails
-     *
-     * @param null
-     *
-     * @var $emails
-     *
-     * @return bool true/false
-     */
-    public function getEmailConfig()
-    {
-        $emails = $this->emails->where('sending_status', '=', 1)->where('fetching_status', '=', 1)->count();
-        if ($emails >= 1) {
-            return true;
-        }
-
-        return false;
-    }
 }
diff --git a/app/Http/ViewComposers/AuthUser.php b/app/Http/ViewComposers/AuthUser.php
index 10a877ce6..16872e9b6 100644
--- a/app/Http/ViewComposers/AuthUser.php
+++ b/app/Http/ViewComposers/AuthUser.php
@@ -23,7 +23,7 @@ class AuthUser
             'auth_name'             => $this->user->name(),
             'auth_user_active'      => $this->user->active,
             'auth_user_primary_dept'=> $this->user->primary_dept,
-            'auth_user_assign_group'=> '', //$this->user->assign_group,
+            'auth_user_assign_group'=> $this->user->assign_group,
         ]);
     }
 }
diff --git a/public/probe.php b/public/probe.php
new file mode 100644
index 000000000..c8ffdbd42
--- /dev/null
+++ b/public/probe.php
@@ -0,0 +1,109 @@
+<?php
+error_reporting();
+
+$extensions = [
+    'curl',
+    'ctype',
+    'imap',
+    'mbstring',
+    // 'mcrypt',
+    'openssl',
+    'tokenizer',
+    'zip',
+    'pdo',
+    'mysqli',
+    'bcmath',
+    'iconv',
+    'XML', //for HTML email processing
+    'json',
+    'fileinfo',
+    //'ioncube_loader_dar_5.6',
+];
+?>
+<html>
+    <head>
+        <style>
+            body {
+                background: #F9F9F9;
+            }
+            table {
+                width:100%;
+            }
+            table, th, td {
+                border: 1px solid black;
+                border-collapse: collapse;
+            }
+            th, td {
+                padding: 5px;
+                text-align: left;
+            }
+            table.t01 tr:nth-child(even) {
+                background-color: #eee;
+            }
+            table.t01 tr:nth-child(odd) {
+                background-color:#fff;
+            }
+            table.t01 th {
+                background-color: #9DD1DE;
+                color: white;
+            }
+        </style>
+    </head>
+    <body>
+        <div style="height: auto; width: 500; margin: auto;">
+            <h1 style="text-align: center; color: #9DD1DE">FAVEO PROBE</h1>
+            <table class="t01">
+                <tr>
+                    <th>Requirements</th>
+                    <th>Status</th>
+                </tr>
+                <?php
+                echo '<tr>';
+                if (version_compare(phpversion(), '7.1.9', '>=') == 1) {
+                    echo "<td>PHP Version</td>  <td style='color:green'>".phpversion().'</td>';
+                } else {
+                    echo "<td>PHP Version</td>  <td style='color:red'>".phpversion().'<p>Please upgrade PHP Version to 7.1.3 or greater version </p></td>';
+                }
+                echo '</tr>';
+                echo '<tr>';
+                $env = '../.env';
+                if (!is_file($env)) {
+                    echo "<td>.env file</td>  <td style='color:green'>Not found</td>";
+                } else {
+                    echo "<td>.env file</td>  <td style='color:red'>Yes Found<p>Please delete  '$env' </p></td>";
+                }
+                echo '</tr>';
+                echo '<tr>';
+                $redirect = in_array('mod_rewrite', apache_get_modules());
+                if ($redirect) {
+                    echo "<td>Rewrite Engine (User friendly URL)</td>  <td style='color:green'>ON</td>";
+                } else {
+                    echo "<td>Rewrite Engine (User friendly URL)</td>  <td style='color:red'>OFF</td>";
+                }
+                echo '</tr>';
+                ?>
+            </table>
+            <br/>
+             <table class="t01">
+                <tr>
+                    <th>PHP Extensions</th>
+                    <th>Status</th>
+                </tr>
+                <?php
+                foreach ($extensions as $extension) {
+                    echo '<tr>';
+                    if (!extension_loaded($extension)) {
+                        echo '<td>'.$extension."</td>  <td style='color:red'>Not Enabled"
+                        ."<p>To enable this, please open '".php_ini_loaded_file()."' and add 'extension = ".$extension."'</p>"
+                        .'</td>';
+                    } else {
+                        echo '<td>'.$extension."</td>  <td style='color:green'>Enabled</td>";
+                    }
+                    echo '</tr>';
+                }
+               ?>
+            </table>
+            <p style='color:red;'>NOTE: Please delete the file 'probe.php' once you have fixed all the issues.</p>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/resources/views/themes/default1/installer/helpdesk/check-js.blade.php b/resources/views/themes/default1/installer/helpdesk/check-js.blade.php
index b16f7b07e..efa7fb2d6 100644
--- a/resources/views/themes/default1/installer/helpdesk/check-js.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/check-js.blade.php
@@ -9,7 +9,7 @@ active
        
         <div class="woocommerce-message woocommerce-tracker" >
                 <center id="fail" style="font-size: 1.3em">JavaScript Disabled!</center>
-                <p style="font-size:1.0em">Hello, Sparky! You are just a few steps away from your support system. It looks like that JavaScript is disabled in your browser or not supported by your browser. FAVEO doesn't work properly without JavaScript, and it may cause errors in installation. Please check and enable JavaScript in your browser in order to install and run FAVEO to its full extent.</p>
+                <p style="font-size:1.0em">Hello, Sparky! You are just a few steps away from your support system. It looks like that JavaScript is not supported or disabled in your browser. FAVEO doesn't work properly without JavaScript, and it may cause errors in installation process. Please check and enable JavaScript in your browser in order to install and run FAVEO to its full extent.</p>
                  <p class="wc-setup-actions step">
             Have you enabled JavaScript?&nbsp;
                 <a href="{!! $url !!}">Click here</a> to reload the page now.
diff --git a/resources/views/themes/default1/installer/helpdesk/view1.blade.php b/resources/views/themes/default1/installer/helpdesk/view1.blade.php
index 2aae2ad13..5cae4c57f 100644
--- a/resources/views/themes/default1/installer/helpdesk/view1.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view1.blade.php
@@ -1,50 +1,26 @@
 @extends('themes.default1.installer.layout.installer')
+@section('environment')
+done
+@stop
 @section('license')
 active
 @stop
 @section('content')
-    <div id="no-js">
-   <noscript>
-        <meta http-equiv="refresh" content="0; URL=JavaScript-disabled">
-        <style type="text/css">#form-content {display: none;}</style>
-    </noscript>
-    </div>
     <div id="form-content">
         <center><h1>License Agreement</h1></center>
 
         <p>Please read this software license agreement carefully before downloading or using the software. By clicking on the "accept" button, opening the package, or downloading the product, you are consenting to be bound by this agreement. If you do not agree to all of the terms of this agreement, stop the installation process and exit.</p>
         <form action="{{URL::route('postlicence')}}" method="post">
-        {{ csrf_field() }}
+            {{ csrf_field() }}
             <div>
                 
                 <div id="openModal" class="modalDialog">
                     <div>
                         <a href="#close" title="Close" class="close">X</a>
                         <div div class="modal-body">
-                            <h1>Open Software License v. 3.0 (OSL-3.0)</h1>
-                        <p>This Open Software License (the &quot;License&quot;) applies to any original work of authorship (the &quot;Original Work&quot;) whose owner (the &quot;Licensor&quot;) has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
-                        <p>Licensed under the Open Software License version 3.0</p>
-                        <p>1) <strong>Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
-                        <p>a) to reproduce the Original Work in copies, either alone or as part of a collective work;</p>
-                        <p>b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works (&quot;Derivative Works&quot;) based upon the Original Work;</p>
-                        <p>c) to distribute or communicate copies of the Original Work and Derivative Works to the public, <u>with  the proviso that copies of Original Work or Derivative Works that You  distribute or communicate shall be licensed under this Open Software  License</u>;</p>
-                        <p>d) to perform the Original Work publicly; and</p>
-                        <p>e) to display the Original Work publicly.</p>
-                        <p>2) <strong>Grant</strong> of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.</p>
-                        <p>3) <strong>Grant</strong> of Source Code License. The term &quot;Source Code&quot; means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.</p>
-                        <p>4) <strong>Exclusions From License Grant.</strong> Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.</p>
-                        <p>5) <strong>External Deployment.</strong> The term &quot;External Deployment&quot; means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).</p>
-                        <p>6) <strong>Attribution Rights.</strong> You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an &quot;Attribution Notice.&quot; You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.</p>
-                        <p>7) <strong>Warranty of Provenance and Disclaimer of Warranty.</strong> Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an &quot;AS IS&quot; BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.</p>
-                        <p>8) <strong>Limitation of Liability.</strong> Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.</p>
-                        <p>9) <strong>Acceptance and Termination.</strong> If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including &quot;fair use&quot; or &quot;fair dealing&quot;). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).</p>
-                        <p>10) <strong>Termination for Patent Action.</strong> This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.</p>
-                        <p>11) <strong>Jurisdiction, Venue and Governing Law.</strong> Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.</p>
-                        <p>12) <strong>Attorneys' Fees.</strong> In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.</p>
-                        <p>13) <strong>Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p>
-                        <p>14) <strong>Definition of &quot;You&quot; in This License.</strong> &quot;You&quot; throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, &quot;You&quot; includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, &quot;control&quot; means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
-                        <p>15) <strong>Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
-                        <p>16) <strong>Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the &quot;Modified License&quot;) and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the &quot;Open Software License&quot; or &quot;OSL&quot; and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice &quot;Licensed under &lt;insert your license name here&gt;&quot; or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
+                            <h1>END USER LICENSE AGREEMENT</h1><p>THIS "END USER LICENSE AGREEMENT" (THE "EULA") IS A LEGAL AGREEMENT BETWEEN THE INDIVIDUAL OR LEGAL ENTITY OR ASSOCIATION INTENDING TO USE THE SOFTWARE ("YOU" OR "CUSTOMER") AND FAVEO. BY REGISTERING FOR THE SOFTWARE OR BY USING THE SOFTWARE, YOU REPRESENT, WARRANT, AND AGREE THAT YOU HAVE READ, UNDERSTOOD, AND AGREE TO BE BOUND TO THE TERMS OF THE EULA. IF YOU DO NOT AGREE TO BE BOUND BY THE EULA, OR YOU DO NOT HAVE AUTHORITY TO BIND CUSTOMER TO THE EULA, YOU MAY NOT USE THE SOFTWARE.</p><h2>Definitions</h2><p><strong>"Active Staff User Account"</strong> means a staff user account that is active in the context of Faveo’s software, meaning that the Staff User Account is fully functional and can be used to authenticate to the Software.</p><p><strong>"Data"</strong> means the data stored in Your helpdesk using the Software.</p><p><strong>"Domain Name"</strong> means an Internet domain name (e.g., sub.domain.com and domain.com).</p><p><strong>"License Key"</strong> means the key that is used to activate the Software for use by Customer.</p><p><strong>"Faveo"</strong>, <strong>"Us"</strong>, <strong>"Ladybird"</strong> and <strong>"We"</strong> means Ladybird Web Solution Pvt Ltd., its employees, representatives and contractors.</p><p><strong>"Site"</strong> means www.faveohelpdesk.com.</p><p><strong>"Software"</strong> means the software that accompanies this EULA.</p><p><strong>"Solution"</strong> means the solution (Faveo Helpdesk, Faveo Service Desk) You choose to have delivered to You as part of the Software.</p><p><strong>"Staff User Account"</strong> means a staff/agent user account in the context of Faveo’s software.</p><p><strong>"Support and Maintenance"</strong> means the optional fee-based subscription that enables a Customer to receive access to support and new releases of and updates to the Software.</p><p><strong>"Third Party Software"</strong> includes any third-party software that may be included with the Software.<h2>1. Grant of License</h2><h3>1.1 License</h3><p> Subject to the EULA and provided that you have a valid License Key, Faveo grants You the revocable, non-exclusive, non-transferable, and non-sublicensable license to use the Software through Your Active Staff User Accounts.<h3>1.2 Staff User Accounts</h3><p> You shall ensure that the number of Your Active Staff User Accounts is equal to or less than the number of Staff User Accounts for which You have subscribed. You are responsible for ensuring that access to a Staff User Account is not shared. Only one individual may authenticate to one Staff User Account. If You are a legal entity or association, all persons using Your Staff User Accounts must be either Your employees or Your contractors who have agreed to be bound by the EULA. Hardware or software you use to pool connections, reroute information, or reduce the number of users that directly access or use the Software (sometimes referred to as “multiplexing” or “pooling”), does not reduce the number of licenses or Active Staff User Accounts you need.<h3>1.3 Third Party Software</h3><p> The Software may contain or be accompanied by Third Party Software that requires notices and/or additional terms and conditions. Such required Third Party Software notices and/or additional terms and conditions may be requested from Faveo and are made a part of and incorporated by reference into the EULA. By accepting the EULA, You are also accepting the additional terms and conditions, if any, set forth therein.<h3>1.4 New Releases, Updates, and Increases to Number of Staff User Accounts</h3><p> You are entitled to use new releases of and updates to the Software, and/or to increase the number of Your Staff User Accounts, only <p>(i) if you elect to purchase a Support and Maintenance subscription and </p><p>(ii) while your Support and Maintenance subscription remains active and in good standing. A Support and Maintenance subscription is optional and, subject to the terms of the EULA, You may use the Software without such a subscription and/or continue to use the Software after such subscription has expired. Any new releases of and updates to the Software you receive and are entitled to use pursuant to this <strong>Section 1.4</strong> shall be included in the definition of “Software” hereunder and shall be governed by the terms of this EULA unless such new release or update is accompanied by a separate license, in which case the terms of that license will govern the Software and/or such new release or update. You may obtain new releases of and/or updates to the Software only from Faveo or other sources authorized by Faveo.</p><h2>2. Conditions and Limitations</h2><h3>2.1 Number of Installations</h3><p> </p>You are permitted only <p>(i) one live, accessible installation of the Software and</p><p>(ii) one private installation that is available for use only by Customer for internal testing purposes. Each live installation of the Software can be accessed through one Domain Name only. If access to the installation is required through multiple Domain Names, additional license(s) are required.</p><h3>2.2 No Reselling, Time-Sharing, or Sub-Licensing</h3><p>You shall not license, sublicense, sell, resell, rent, lease, transfer, assign, distribute, time share or otherwise commercially exploit or make the Software available to any third party, other than as expressly permitted by the EULA.<h3>2.3 No Unlawful Use or Objectionable Content</h3><p> You shall not use the Software in any unlawful manner or in any manner that interferes with or disrupts the integrity or performance of the Software and its components or infringes on the rights of another party. You shall not modify, adapt or hack any protected (encrypted or compiled) parts of the Software, or otherwise attempt to gain unauthorized access to those parts or its related systems or networks. You undertake not to promote any material that is unlawful, threatening, abusive, malicious, defamatory, false, materially inaccurate, or otherwise objectionable. You will not reproduce, publish, or distribute content in connection with the Software that infringes any third party’s trademark, copyright, patent, trade secret, publicity, privacy, or other personal or proprietary right. Faveo offers no assurance that Your use of the Software under the terms of the EULA will not violate any law or regulation applicable to You.<h3>2.4 Responsibility for Use</h3><p> You must only install the Software and make the Software available for use on systems owned, leased, or controlled by You in such a way that You can guarantee compliance with the terms of the EULA. You assume all responsibility for any and all use of the Software, including but not limited to content and media that is created, uploaded to, downloaded from, transmitted and edited using the Software. You are responsible for any accesses made to the Software.<h3>2.5 Attribution</h3><p> With respect to any use of the Software, You shall keep the attribution and hyperlink to Faveo and its website intact unless a license (at a cost) is obtained from Faveo to do so.<h3>2.6 Software Backup</h3><p> You may make one copy the Software for backup and archival purposes, provided that the original and the copy are kept in Your possession and that Your installation and use of the Software does not exceed that allowed in the EULA.<h3>2.7 Data Backups</h3><p> You assume all responsibility for all of Your Data and any backups thereof.<h3>2.8 Unsolicited Email</h3><p> You may not use the Software to send unsolicited email ("spam") to anyone, including mailing lists which You have purchased.<h3>2.9 Securing Your Authentication Details</h3><p> You will ensure that all passwords and login credentials remain secure at all times for You and each of Your Staff User Accounts. If in the case that You suspect a security violation You also undertake to notify Faveo immediately.<h3>2.10 Handling Software</h3><p> You shall not <p>(a) reverse engineer, decompile, disassemble, or decrypt any portion of compiled and/or source code, in whole or in part, or otherwise attempt to discover the source code to the software used in the Software, </p><p>(b) use any Third Party Software independently of the Software, or </p><p>(c) make any attempt to circumvent parts of the Software designed to enforce the maximum number of Staff User Accounts for which You have paid. You obtain no rights to the Software except for the limited rights to use the Software expressly granted by the EULA.</p><h3>2.11 Limited License</h3><p> You acknowledge and agree that <p>(i) the Software is the property of Faveo and is licensed and not sold to You under the EULA and </p><p>(ii) the Software uses, embodies, and contains confidential and proprietary information and technology of Faveo and/or its licensors and embodies trade secrets and intellectual property of Faveo and/or its licensors protected under United Kingdom copyright and other laws, and by international treaty provisions (collectively referred to as “Ladybird's Intellectual Property Rights”). Your rights in the Software are strictly limited to those license rights expressly granted under <strong>Section 1.1</strong> above, and Faveo retains all rights not expressly granted herein. </p><p>Without limiting the foregoing, Faveo and/or its licensors retain all right, title, and interest in and to Faveo’s Intellectual Property Rights, including but not limited to: <p>(i) all software code (source and object), functionality, technology, system or network architecture and user interfaces and all modifications there to and </p><p>(ii) all trade secrets, patents, copyrights and other intellectual property rights with respect to the Software. You further acknowledge that there are no implied licenses granted under the EULA.</p><h3>2.12 Obtaining the Software</h3><p>You shall not obtain copies of the Software through any means other than directly through the Site using your Faveo customer account credentials. Faveo does not guarantee that the Software will be available for download from the Site for a period longer than 90 days following Your purchase.<h3>2.13 Disrepute</h3><p> You shall not commit any act likely to result in the disrepute or harming of interests of Faveo’s name or the name of its third party suppliers, whether through explicit act or omission.<h2>3. Liabilities, warranties and indemnification</h2><h3>3.1 Disclaimer of Warranties</h3><p> <strong>No Warranties.</strong> <p>THE SOFTWARE AND THE SITE ARE PROVIDED “AS IS” AND “AS AVAILABLE” WITHOUT ANY WARRANTY OF ANY KIND, EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. Faveo MAKES NO WARRANTY THAT</p><p>(i) THE SOFTWARE WILL MEET YOUR REQUIREMENTS, </p><p>(ii) THE SOFTWARE WILL BE UNINTERRUPTED, TIMELY, SECURE, ERROR-FREE, OR VIRUS-FREE, </p><p>(iii) THE RESULTS THAT MAY BE OBTAINED FROM THE USE OF THE SOFTWARE WILL BE ACCURATE OR RELIABLE, </p><p>(iv) THE QUALITY OF ANY PRODUCTS, SERVICES, INFORMATION, OR OTHER MATERIAL PURCHASED OR OBTAINED BY YOU THROUGH THE SOFTWARE WILL MEET YOUR EXPECTATIONS, AND </p><p>(v) ANY ERRORS IN THE SOFTWARE WILL BE CORRECTED. NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY YOU FROM Faveo OR THROUGH OR FROM THE SOFTWARE SHALL CREATE ANY WARRANTY NOT EXPRESSLY STATED HEREIN.</p><h3>3.2 Carrier Lines</h3><p> YOU ACKNOWLEDGE THAT ACCESS TO THE SOFTWARE WILL BE PROVIDED OVER VARIOUS FACILITIES AND COMMUNICATIONS LINES, AND INFORMATION WILL BE TRANSMITTED OVER LOCAL EXCHANGE AND INTERNET BACKBONE CARRIER LINES AND THROUGH ROUTERS, SWITCHES, AND OTHER DEVICES (COLLECTIVELY, “CARRIER LINES”) OWNED, MAINTAINED, AND SERVICED BY THIRD-PARTY CARRIERS, UTILITIES, INTERNET SERVICE PROVIDERS, ALL OF WHICH ARE BEYOND Faveo’s CONTROL. Faveo ASSUMES NO LIABILITY FOR OR RELATING TO THE INTEGRITY, PRIVACY, SECURITY, CONFIDENTIALITY, OR USE OF ANY INFORMATION WHILE IT IS TRANSMITTED ON THE CARRIER LINES, OR ANY DELAY, FAILURE, INTERRUPTION, INTERCEPTION, LOSS, TRANSMISSION, OR CORRUPTION OF ANY DATA OR OTHER INFORMATION ATTRIBUTABLE TO TRANSMISSION ON THE CARRIER LINES. USE OF THE CARRIER LINES IS SOLELY AT YOUR RISK AND IS SUBJECT TO ALL APPLICABLE LOCAL, STATE, NATIONAL, AND INTERNATIONAL LAWS.<h3>3.3 Unauthorized Access: Lost or Corrupt Data</h3><p> Faveo IS NOT RESPONSIBLE FOR UNAUTHORIZED ACCESS TO ANY DATA, FACILITIES, OR EQUIPMENT BY ANYONE USING THE SOFTWARE OR FOR UNAUTHORIZED ACCESS TO OR ALTERATION, THEFT, CORRUPTION, LOSS, OR DESTRUCTION OF ANY DATA FILES, PROGRAMS, PROCEDURES, OR INFORMATION THROUGH THE SOFTWARE, WHETHER BY ACCIDENT, FRAUDULENT MEANS OR DEVICES, OR ANY OTHER MEANS. YOU ARE SOLELY RESPONSIBLE FOR VALIDATING THE ACCURACY OF ALL OUTPUT AND REPORTS. YOU HEREBY WAIVE ANY DAMAGES OCCASIONED BY LOST OR CORRUPT DATA, INCORRECT REPORTS, OR INCORRECT DATA FILES RESULTING FROM PROGRAMMING ERROR, OPERATOR ERROR, EQUIPMENT OR SOFTWARE MALFUNCTION, SECURITY VIOLATIONS, OR THE USE OF THIRD-PARTY SOFTWARE. Faveo IS NOT RESPONSIBLE FOR THE CONTENT OF ANY INFORMATION TRANSMITTED OR RECEIVED THROUGH Faveo’S PROVISION OF THE SOFTWARE. ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SOFTWARE IS DONE AT YOUR OWN DISCRETION AND RISK AND THAT YOU WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SERVICE OR LOSS OF DATA THAT RESULTS FROM THE DOWNLOAD OF ANY SUCH MATERIAL. Faveo SHALL NOT BE HELD RESPONSIBLE FOR DATA HOSTED ON ITS SERVERS AND YOU ARE SOLELY RESPONSIBILITY FOR MAINTAINING LOCAL COPIES OF YOUR DATA AND MAINTAINING PROPER AND SUFFICIENT INSURANCE IF COVERAGE IS REQUIRED WITH RESPECT TO DATA LOSS.<h3>3.4 Third-Party Sites and Service Providers</h3><p> THE SOFTWARE MAY CONTAIN HYPERLINKS (INCLUDING HYPERLINKED ADVERTISEMENTS) TO INTERNET WEB SITES OPERATED BY THIRD PARTIES, OR TO MATERIALS OR INFORMATION MADE AVAILABLE BY THIRD PARTIES. SUCH THIRD PARTIES MAY OFFER GOODS OR SERVICES FOR SALE TO YOU. SUCH LINKS DO NOT CONSTITUTE OR IMPLY Faveo’S ENDORSEMENT OF SUCH THIRD PARTIES, OR OF THE CONTENT OF THEIR SITES, THE QUALITY OR EFFICACY OF THEIR GOODS OR SERVICES, OR THEIR INFORMATION PRIVACY OR SECURITY PRACTICES, AND Faveo HAS NO RESPONSIBILITY FOR INFORMATION, GOODS, OR SERVICES OFFERED OR PROVIDED BY SUCH THIRD PARTIES, OR FOR THE MANNER IN WHICH THEY CONDUCT THEIR OPERATIONS. YOUR USE OF THIRD-PARTY SITES AND THE MATERIALS, GOODS, AND SERVICES OFFERED BY THEM IS ENTIRELY AT YOUR OWN RISK, AND IS SUBJECT TO THE TERMS OF USE OF THE THIRD PARTIES OPERATING OR PROVIDING THEM. YOU SHOULD ASSUME THAT ANY INTERNET PAGE OR OTHER MATERIAL THAT DOES NOT BEAR THE Faveo LOGO IS PROVIDED BY A THIRD PARTY.<h3>3.5 Warranties Required By Applicable Law</h3><p> IF APPLICABLE LAW REQUIRES ANY WARRANTIES WITH RESPECT TO THE SOFTWARE, ALL SUCH WARRANTIES ARE LIMITED IN DURATION TO NINETY (90) DAYS FROM THE DATE YOU REGISTERED FOR THE SOFTWARE.<h3>3.6 Limitation of Liability</h3><p> IN NO EVENT SHALL Faveo BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY INDIRECT, SPECIAL, INCIDENTAL, EXEMPLARY, PUNITIVE, COVER, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR THE INABILITY TO USE EQUIPMENT OR ACCESS DATA, LOSS OF BUSINESS, LOSS OF PROFITS, BUSINESS INTERRUPTION OR THE LIKE), ARISING OUT OF THE USE OF, OR INABILITY TO USE, THE SOFTWARE AND BASED ON ANY THEORY OF LIABILITY INCLUDING WITHOUT LIMITATION BREACH OF CONTRACT, BREACH OF WARRANTY, TORT (INCLUDING WITHOUT LIMITATION NEGLIGENCE), PRODUCT LIABILITY OR OTHERWISE, EVEN IF Faveo OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND EVEN IF A REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS ESSENTIAL PURPOSE. Faveo’S TOTAL LIABILITY TO YOU AND THIRD PARTIES FOR ACTUAL DAMAGES FOR ANY CAUSE WHATSOEVER WILL BE LIMITED TO THE AMOUNT PAID BY YOU FOR THE SOFTWARE. THE PROVISIONS OF THIS SECTION ALLOCATE THE RISKS UNDER THE EULA BETWEEN THE PARTIES, AND THE PARTIES HAVE RELIED ON THESE LIMITATIONS IN DETERMINING WHETHER TO ENTER INTO THE EULA AND HOW TO PRICE THE SOFTWARE. SOME JURISDICTIONS MAY NOT ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU AND YOU MAY ALSO HAVE OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO JURISDICTION. THE FOREGOING LIMITATIONS ON LIABILITY ARE INTENDED TO APPLY TO THE WARRANTIES AND DISCLAIMERS ABOVE AND ALL OTHER ASPECTS OF THE SOFTWARE AND THE EULA.<h3>3.7 Indemnification</h3><p> You agree to indemnify, defend, and hold harmless Faveo and other users of Faveo services, and Faveo’s and their affiliates, officers, directors, and agents, from and against any claim, cost or liability, including reasonable attorneys’ fees, arising out of or relating to: <p>(a) Your use of the Software; </p><p>(b) any content You create, transmit, or display while using the Software; </p><p>(c) any breach by You of any representations, warranties, or agreements contained in the EULA; </p><p>(d) any unlicensed use of the Software using Your Staff User Accounts; and </p><p>(e) Your negligent or wilful misconduct.</p><h3>3.8 Notification of Claim</h3><p> In no event will a claim by brought by You unless the licensee has notified Faveo of the claim within one year of it arising.<h3>3.9 Infringement</h3><p> Subject to the remainder of this Section 3.9 and to the limitations set forth in Section 3.6, Faveo will indemnify and hold You harmless against a claim to the extent based on an allegation that Your use of the Software (in the form provided by Faveo) in compliance with this Agreement infringes a United States or European Union patent or registered copyright (“Claim”), and will pay those damages and costs finally awarded against You by a court of competent jurisdiction, or agreed to in writing by Faveo as settlement, as a result of such Claim, provided that the licensee has notified Faveo of the Claim within sixty (60) days of it arising. Faveo will have no liability for any damages or costs to the extent that a Claim is based upon: <p>(i) use of Software in combination with any non-Faveo product, software or equipment; </p><p>(ii) use of Software in a manner or for an application other than for which it was designed or intended to be used, regardless of whether Faveo was aware of or had been advised of such use; </p><p>(iii) modifications to Software by any person or entity other than Faveo; </p><p>(iv) any breach by You of any representations, warranties, or agreements contained in the EULA; (v) any unlicensed use of the Software using Your Staff User Accounts; or </p><p>(v) Your negligent or wilful misconduct.</p><p> If the Software becomes, or in the opinion of Faveo may become, the subject of a Claim, Faveo may, at its option and in its discretion: </p><p>(i) procure for You the right to use the Software free of any liability; </p><p>(ii) replace or modify the Software to make it non-infringing; or </p><p>(iii) terminate Your right to continue using such Software and refund, on a prorated basis, any license fees related to the Software paid by You.</p><h2>4. Trademarks and publicity</h2><h3>4.1 Use of Names and Trademarks</h3><p> While You remain licensed to use the Software, You may use Faveo’s name or logos in order to identify Yourself as a customer. You shall not otherwise use Faveo’s name or trademarks, unless written permission is obtained from Faveo or otherwise set out in the EULA.<h3>4.2 Disrepute</h3><p> You shall not commit any act where the result of which is the likely disrepute or harming of interests of Faveo’s name or the name of its third party vendors, whether through explicit act or omission.<h3>4.3 Promotional Materials and Publicity</h3><p> You authorize Faveo to use Your name and trademarks in Faveo’s promotional materials and for publicity purposes. You can opt-out at any time by writing to: <a href="mailto:support@ladybirdweb.com">support@ladybirdweb.com</a>.<h2>5. Confidentiality</h2><h3>5.1 Access to and Disclosure of Your Data</h3><p> You acknowledge and agree that Faveo may access, use, and store Your Data for the purpose of responding to Your requests for technical support and/or providing other services that we have agreed, or may in the future agree, to provide. You also agree that Faveo may collect anonymized usage data from and/or relating to Your Data and Your use of the Software (“Anonymized Usage Data”). Anonymized Usage Data will not include identifying information about Your customers, such as Your customer contact information, or copies of communications between You and Your customers. Faveo shall maintain reasonable administrative, physical, and technical safeguards for protection of the security, confidentiality, and integrity of any of Your Data in Faveo’s possession. Faveo will not disclose any of Your Data in Faveo’s possession to a third party unless compelled by law or court order or if You consent in writing to the disclosure.<h3>5.2 Anonymized Usage Data</h3><p> In consideration of Faveo’s provision of a license to access and use the Software, You hereby transfer and assign to Faveo all right, title, and interest in and to all Anonymized Usage Data that Faveo makes from Your data pursuant to Section 5.1. You agree that Faveo may use, disclose, market, license, and sell such Anonymized Usage Data for any purpose without restriction, and that you have no interest in such information, or in the proceeds of any sale, license, or other commercialization thereof.<h3>5.3. Privacy Policy</h3><p> The privacy policy is available at http://www.faveohelpdesk.com/privacy-policy/. By agreeing to the EULA, You accept the terms of Faveo’s privacy policy.<h2>6. Payments, Sales, and Refunds</h2><h3>6.1 Payment of Fees</h3><p> You must pay all fees by the due dates.<h3>6.2 Upgrading, Downgrading, or Switching Solution</h3><p> The amount You pay for the Software is dependent on the Solution selected and the number of Staff User Accounts selected. If You elect to switch to a Solution which costs more or increase the number of Staff User Accounts, Faveo will invoice You for the marginally increased amount owed. If You switch to a Solution which costs less or decrease the number of Staff User Accounts, Faveo will not be required to refund any prepaid amount. Because the price of the Support and Maintenance subscription is a function of the cost of the Solution and number of Staff User Accounts you have selected, You will also be required to pay any difference in the price of the Support and Maintenance subscription. To change your Solution or the number of Staff User Accounts, you must, at Faveo’s sole discretion, enter into a new license agreement for the Software on the then-current terms.<h3>6.3 Price Changes</h3><p> Faveo reserves the right to change prices at any time.<h3>6.4 Credit Card Billing</h3><p> If You choose to pay by credit or debit card You authorize Ladybird to debit Your account renewal fees, if any, from Your card. Ladybird uses a third-party intermediary to manage credit card processing and this intermediary is not permitted to store, retain, or use Your billing information except to process Your credit card information for Faveo. Faveo may use Your information in order to perform fraud screening.<h3>6.5 Refunds</h3><p> Ladybird has no obligation to issue refunds. Faveo offer Community edition for evaluation that should be used to evaluate and test the Software before purchasing. Any refunds will be made entirely at Ladybird’s discretion.<h3>6.6 Taxes</h3><p> Unless otherwise stated, Faveo’s charges do not include any taxes, levies, duties or similar governmental assessments, including value-added, sales, use or withholding taxes assessable by any local, state, provincial or foreign jurisdiction (collectively "Taxes"). You are responsible for paying Taxes except those assessable against Ladybird based on its income. Ladybird will invoice You for such Taxes if Ladybird believes there is a legal obligation to do so and You agree to pay such Taxes if so invoiced.<h3>7. Termination and Modification</h3><p><h3>7.1 Termination</h3><p> This EULA is effective until terminated. This EULA and your license and other rights under this EULA will terminate automatically without notice from Faveo if You fail to comply with any term(s) of this EULA.<h3>7.2 No Refund</h3><p> Faveo will not refund any amounts to You if this EULA and your rights to use the Software are terminated due to Your failure to comply with any term(s) of this EULA.<h3>7.3 Effect of Termination</h3><p> Upon the termination of this EULA, you must cease all use of the Software and destroy all copies, full or partial, of the Software.<h3>7.4 Recovery of fees and costs</h3><p> Should You continue to use the Software after termination of this EULA, You will be liable to pay all costs, including reasonable attorneys fees, of Faveo to enforce this EULA, as well as any damages suffered by Faveo.<h3>7.5 Survival</h3><p> Articles <strong>3, 4, 5, 6, 7, and 8</strong> of the EULA will survive termination of the EULA.<h2>8. Interpretation</h2><h3>8.1 Assignment</h3><p> You may not assign Your account with Faveo or Your rights under the EULA without Ladybird’s prior written consent, except in the case of a sale of all or substantially all of Your assets. Faveo may assign, in whole or in part, its rights, interests, and obligations hereunder without limitation.<h3>8.2 Headings</h3><p> Descriptive headings are for convenience only and shall not control or affect the meaning or construction of any provision of this Agreement.<h3>8.3 Enforcement</h3><p> The failure of Ladybird to exercise or enforce any right or provision of the EULA shall not be a waiver of that right. No provision in the EULA shall be deemed waived and no breach excused, unless such waiver or consent shall be in writing and signed by the party claimed to have waived or consented. Any consent by any party to, or waiver of a breach by the other, whether expressed or implied, shall not constitute a consent to, waiver of, or excuse for any other different or subsequent breach.<h3>8.4 Export Controls</h3><p> You agree to comply with all applicable export and reexport control laws and regulations, including without limitation the Export Administration Regulations maintained by the U.S. Department of Commerce and trade and economic sanctions maintained by the Treasury Department’s Office of Foreign Assets Control. If You are in a country outside of the India, You agree to additionally comply with any local rules regarding online conduct and acceptable content, including without limitation laws regulating the export and reexport of data to and from the India or such other country.<h3>8.5 Choice of Law</h3><p> The interpretation of the EULA and the resolution of any disputes arising under or in connection with the EULA shall be governed by the laws of the India. The United Nations Convention on Contracts for the Sale of Goods does not apply.<h3>8.6 Dispute Resolution</h3><p> In the event of a claim or dispute between You and Ladybird arising under or in connection with the EULA or the Software, the parties shall first attempt to settle the claim or dispute by direct discussions. If discussions are not successful, the parties shall arbitrate pursuant to the Karnataka High Court, with a final judgment to be entered upon the arbitration award. The venue for discussions and arbitration shall be Bangalore, Karnataka, India.<h3>8.7 Severability</h3><p> Any provision of the EULA that shall prove to be invalid, void, or illegal, shall in no way affect, impair, or invalidate any other provision of the EULA, and such other provisions shall remain in full force and effect.<h3>8.8 Notices</h3><p> You agree that Ladybird may provide You with notices, including without limitation those regarding changes to the EULA, by email, regular mail, or messages or postings through the Software.<h3>8.9 Complete Understanding</h3><p> The EULA constitutes the entire agreement between You and Ladybird and govern Your use of the Software, superseding any prior agreements between You and Ladybird for the use of the Software. You also may be subject to additional terms and conditions that may apply when You use or purchase certain other Ladybird services, affiliate services, third-party content, or third-party software.<h3>8.10. No Third-Party Beneficiaries</h3><p> Nothing express or implied in the EULA is intended to confer, nor shall confer, upon any person or entity other than the parties and their respective successors or assigns any rights, remedies, obligations, or liabilities whatsoever.</p>
+
+
                             <br>
                         </div>
                             <a style="float: right;" href="#" title="Close" class="button-primary button button-large button-next">Close</a>
@@ -52,14 +28,15 @@ active
 
                     </div>
                 </div>
-                <input id="Acceptme" class="input-checkbox" type="checkbox">
+                <input id="Acceptme" class="input-checkbox" name="acceptme" type="checkbox">
             <label for="Acceptme">I accept the <a href="#openModal">License Agreement</a></label>
             </div>
             <br>
             <p class="setup-actions step">
-                <a href="{!! route('prerequisites') !!}"><input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue" name="accept1"></a>
-                <input type="submit" class="button button-large button-next" value="Cancel" style="float: left">
+                <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue" name="accept1">
+                <a href="{!! route('prerequisites') !!}" class="button button-large button-next" style="float: left">Previous</a>
             </p>
+            <br>
         </form>
         </div>
     <script>
diff --git a/resources/views/themes/default1/installer/helpdesk/view2.blade.php b/resources/views/themes/default1/installer/helpdesk/view2.blade.php
index 7f5f87a26..13f634a37 100644
--- a/resources/views/themes/default1/installer/helpdesk/view2.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view2.blade.php
@@ -1,9 +1,5 @@
 @extends('themes.default1.installer.layout.installer')
 
-@section('license')
-done    
-@stop
-
 @section('environment')
 active
 @stop
@@ -11,7 +7,13 @@ active
 
 
 @section('content')
-
+<div id="no-js">
+   <noscript>
+        <meta http-equiv="refresh" content="0; URL=JavaScript-disabled">
+        <style type="text/css">#form-content {display: none;}</style>
+    </noscript>
+</div>
+    
 <div id="form-content">
 <center><h1>Environment Test</h1></center>
          @if (Session::has('fail_to_change'))
@@ -53,8 +55,8 @@ class TestResult {
      <?php
 
 function validate_php(&$results) {
-    if (version_compare(PHP_VERSION, '5.5') == -1) {
-        $results[] = new TestResult('Minimum PHP version required in order to run Faveo HELPDESK is PHP 5.5. Your PHP version: ' . PHP_VERSION, STATUS_ERROR);
+    if (version_compare(PHP_VERSION, '7.1.3') == -1) {
+        $results[] = new TestResult('PHP version required in order to run Faveo HELPDESK is PHP 7.1.3 or greater. Your PHP version: ' . PHP_VERSION, STATUS_ERROR);
         return false;
     } else {
         $results[] = new TestResult('Your PHP version is ' . PHP_VERSION, STATUS_OK);
@@ -74,6 +76,7 @@ function validate_php(&$results) {
 function php_config_value_to_bytes($val) {
     $val = trim($val);
     $last = strtolower($val{strlen($val) - 1});
+    $val = (integer)$val;
     switch ($last) {
         // The 'G' modifier is available since PHP 5.1.0
         case 'g':
@@ -178,7 +181,9 @@ function validate_zend_compatibility_mode(&$results) {
 function validate_extensions(&$results) {
     $ok = true;
 
-    $required_extensions = array('mcrypt', 'openssl', 'pdo', 'fileinfo', 'curl', 'zip', 'mbstring');
+    $required_extensions = ['curl', 'ctype', 'imap', 'mbstring',
+        'openssl', 'tokenizer', 'zip', 'pdo', 'mysqli', 'bcmath',
+       'iconv', 'xml', 'json'];
 
     foreach ($required_extensions as $required_extension) {
         if (extension_loaded($required_extension)) {
@@ -202,7 +207,8 @@ function validate_extensions(&$results) {
     } // if
 
     $recommended_extensions = array(
-        'imap' => 'IMAP extension is used for connecting to mail server using IMAP settings to fetch emails in the system.'
+        // 'imap' => 'IMAP extension is used for connecting to mail server using IMAP settings to fetch emails in the system.',
+        // 'mcrypt' => 'Optional extension',
         // 'gd' => 'GD is used for image manipulation. Without it, system is not able to create thumbnails for files or manage avatars, logos and project icons. Please refer to <a href="http://www.php.net/manual/en/image.installation.php">this</a> page for installation instructions',
         // 'mbstring' => 'MultiByte String is used for work with Unicode. Without it, system may not split words and string properly and you can have weird question mark characters in Recent Activities for example. Please refer to <a href="http://www.php.net/manual/en/mbstring.installation.php">this</a> page for installation instructions',
         // 'curl' => 'cURL is used to support various network tasks. Please refer to <a href="http://www.php.net/manual/en/curl.installation.php">this</a> page for installation instructions',
@@ -257,6 +263,7 @@ function checkMaxExecutiontime(&$results)
     }
     return $ok;
 }
+
 // ---------------------------------------------------
 //  Do the magic
 // ---------------------------------------------------
@@ -288,7 +295,7 @@ if ($php_ok && $memory_ok && $extensions_ok && $file_permission && $required_fun
 
 
     <form action="{{URL::route('postprerequisites')}}" method="post"  class="border-line">
-        <input type="hidden" name="_token" value="{{ csrf_token() }}">
+        {{ csrf_field() }}
         <p class="setup-actions step">
             <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue">
             <a href="{!! route('licence') !!}" class="button button-large button-next" style="float: left">Previous</a>
@@ -319,4 +326,4 @@ if ($php_ok && $memory_ok && $extensions_ok && $file_permission && $required_fun
       </div>
 </div>
 </div>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/themes/default1/installer/helpdesk/view3.blade.php b/resources/views/themes/default1/installer/helpdesk/view3.blade.php
index e21e7abde..1ff06694b 100644
--- a/resources/views/themes/default1/installer/helpdesk/view3.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view3.blade.php
@@ -53,7 +53,7 @@ active
             <td>
                 <div class="side-by-side clearfix moveleftthre">
                     <div>
-                        <select name="default" data-placeholder="Choose a SQL format..." class="chosen-select" style="width:290px;" tabindex="2">
+                        <select name="default" data-placeholder="Choose a SQL format..." class="chosen-select" style="width:288px;" tabindex="2">
                             <option value="mysql">MySQL</option>
                         </select>
                     </div>
@@ -126,9 +126,15 @@ active
         </tr>
     </table>
     <br>
+    <p ng-controller="MainController">
+        <input id="dummy-data" class="input-checkbox" type="checkbox" name="dummy-data">
+            <label for="dummy-data" style="color:#3AA7D9">Install dummy data</label>
+            <button type="button" data-toggle="popover" data-placement="right" data-arrowcolor="#eeeeee" data-bordercolor="#bbbbbb" data-title-backcolor="#cccccc" data-title-bordercolor="#bbbbbb" data-title-textcolor="#444444" data-content-backcolor="#eeeeee" data-content-textcolor="#888888" title="@{{DummyDataTitle}}" data-content="@{{DummyDataContent}}" style="padding: 0px;border: 0px; border-radius: 5px;"><i class="fa fa-question-circle" style="padding: 0px;"></i>
+                            </button>
+    </p>
     <p class="setup-actions step">
         <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue">
-        <a href="{!! route('prerequisites') !!}" class="button button-large button-next" style="float: left">Previous</a>
+        <a href="{!! route('licence') !!}" class="button button-large button-next" style="float: left">Previous</a>
     </p>
     <br>
 </form>
@@ -169,16 +175,22 @@ active
     @endif
 
     $('#databaseform').on('submit', function(e){
+        var empty_field = 0;
         $("#databaseform input[type=text]").each(function(){
             if($(this).attr('name') == 'host' || $(this).attr('name') == 'databasename' || $(this).attr('name') == 'username'){
                 if ($(this).val() == '') {
                     $(this).css('border-color','red')
                     $(this).css('border-width','1px');
-                    e.preventDefault();
-                    alert('Please fill all required values.');
+                    empty_field = 1;
+                } else {
+                    empty_field = 0;
                 }
             }
         });
+        if (empty_field != 0) {
+            e.preventDefault();
+            alert('Please fill all required values.');
+        }
     });
 
     $('input[type=text]').on('blur', function(){
diff --git a/resources/views/themes/default1/installer/helpdesk/view4.blade.php b/resources/views/themes/default1/installer/helpdesk/view4.blade.php
index 4f446dcd2..b0b437e01 100644
--- a/resources/views/themes/default1/installer/helpdesk/view4.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view4.blade.php
@@ -14,8 +14,8 @@ active
 
 @section('content') 
 
-    <h1 style="text-align: center;">Database Setup</h1>
-        This test will check prerequisites required to install Faveo<br/>
+<h1 style="text-align: center;">Database Setup</h1>
+This test will check prerequisites required to install Faveo<br/>
 <?php
 /**
  * Faveo HELPDESK Probe
@@ -29,6 +29,7 @@ $host = Session::get('host');
 $username = Session::get('username');
 $password = Session::get('password');
 $databasename = Session::get('databasename');
+$dummy_install = Session::get('dummy_data_installation');
 $port = Session::get('port');
 define('DB_HOST', $host); // Address of your MySQL server (usually localhost)
 define('DB_USER', $username); // Username that is used to connect to the server
@@ -40,23 +41,34 @@ define('PROBE_FOR', '<b>Faveo</b> HELPDESK 1.0 and Newer');
 define('STATUS_OK', 'Ok');
 define('STATUS_WARNING', 'Warning');
 define('STATUS_ERROR', 'Error');
+
 class TestResult {
+
     var $message;
     var $status;
+
     function __construct($message, $status = STATUS_OK) {
         $this->message = $message;
         $this->status = $status;
     }
-} // TestResult
+
+}
+
+// TestResult
 if (DB_HOST && DB_USER && DB_NAME) {
     ?>
-<?php
+    <?php
     $mysqli_ok = true;
     $results = array();
     // error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
     error_reporting(0);
-    if($default == 'mysql') {
-        if ($connection = mysqli_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME)) {
+    if ($default == 'mysql') {
+    	if(DB_PORT != '' && is_numeric(DB_PORT)) {
+    		$connection = mysqli_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+    	} else {
+    		$connection = mysqli_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+    	}
+        if ($connection) {
             $results[] = new TestResult('Connected to database as ' . DB_USER . '@' . DB_HOST . DB_PORT, STATUS_OK);
             if (mysqli_select_db($connection, DB_NAME)) {
                 $results[] = new TestResult('Database "' . DB_NAME . '" selected', STATUS_OK);
@@ -64,7 +76,7 @@ if (DB_HOST && DB_USER && DB_NAME) {
                 if (version_compare($mysqli_version, '5') >= 0) {
                     $results[] = new TestResult('MySQL version is ' . $mysqli_version, STATUS_OK);
                     // $have_inno = check_have_inno($connection);
-                    $sql = "SHOW TABLES FROM ".DB_NAME;
+                    $sql = "SHOW TABLES FROM " . DB_NAME;
                     $res = mysqli_query($connection, $sql);
                     if (mysqli_fetch_array($res) === null) {
                         $results[] = new TestResult('Database is empty');
@@ -78,14 +90,14 @@ if (DB_HOST && DB_USER && DB_NAME) {
                     $mysqli_ok = false;
                 } // if
             } else {
-                $results[] = new TestResult('Failed to select database. ' . mysqli_error(), STATUS_ERROR);
+                $results[] = new TestResult('Failed to select database. ' . mysqli_connect_error(), STATUS_ERROR);
                 $mysqli_ok = false;
             } // if
         } else {
-            $results[] = new TestResult('Failed to connect to database. ' . mysqli_error(), STATUS_ERROR);
+            $results[] = new TestResult('Failed to connect to database. ' . mysqli_connect_error(), STATUS_ERROR);
             $mysqli_ok = false;
         } // if
-    } 
+    }
     // elseif($default == 'pgsql') {
     //     if ($connection2 = pg_connect("'host='.DB_HOST.' port='.DB_PORT.' dbname='.DB_NAME.' user='.DB_USER.' password='.DB_PASS.")) {
     //         $results[] = new TestResult('Connected to database as ' . DB_USER . '@' . DB_HOST, STATUS_OK);
@@ -94,7 +106,6 @@ if (DB_HOST && DB_USER && DB_NAME) {
     //         $mysqli_ok = false;
     //     }
     // } elseif($default == 'sqlsrv') {
-        
     // }
     // ---------------------------------------------------
     //  Validators
@@ -105,105 +116,180 @@ if (DB_HOST && DB_USER && DB_NAME) {
         print '<br><span class="' . strtolower($result->status) . '">' . $result->status . '</span> &mdash; ' . $result->message . '';
     } // foreach
     ?> </p>
-<!-- </ul> -->
+    <!-- </ul> -->
 <?php } else { ?>
-      <p>Database test is <strong>turned off</strong>. To turn it On, please open probe.php in your favorite text editor and set DB_XXXX connection parameters in database section at the beginning of the file:</p>
-      <ul>
-        <li>DB_HOST &mdash; Address of your MySQL server (usually localhost)</li>
-        <li>DB_USER &mdash; Username that is used to connect to the server</li>
-        <li>DB_PASS &mdash; User's password</li>
-        <li>DB_NAME &mdash; Name of the database you are connecting to</li>
-      </ul>
-      <p>Once these settings are set, probe.php will check if your database meets the system requirements.</p>
-<?php $mysqli_ok = null;?>
-<?php }  ?>
+    <br/>
+    <ul>
+        <li><p>Unable to test database connection. Please make sure your database server is up and running and PHP is working with session.</p></li>
+    </ul>
+    <p>If you have fixed all the errors. <a href="{{ URL::route('configuration') }}">Click here</a> to continue the installation process.</p>
+    <?php $mysqli_ok = null; ?>
+<?php } ?>
 
-<?php if ($mysqli_ok !== null) {?>
-<?php if ($mysqli_ok) {?>
+<?php if ($mysqli_ok !== null) { ?>
+    <?php if ($mysqli_ok) { ?>
 
-<div class="woocommerce-message woocommerce-tracker" >
-    <p id="pass">Database connection successful. This system can run Faveo</p>
-</div>
+        <div class="woocommerce-message woocommerce-tracker" >
+            <p id="pass">Database connection successful. This system can run Faveo</p>
+        </div>
 
-<script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}"></script>
+        <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}"></script>
 
-<span id="wait">Please wait this may take a while......</span>
+        <span id="wait"></span>
 
-{!! Form::open( ['id'=>'form','method' => 'POST'] )!!}
-{{-- <input type="hidden" name="_token" value="{{ csrf_token() }}"> --}}
-    <!-- <b>default</b><br> -->
-    <input type="hidden" name="default" value="{!! $default !!}"/>
-    <!-- <b>Host</b><br> -->
-    <input type="hidden"  name="host" value="{!! $host !!}"/>
-    <!-- <b>Database Name</b><br> -->
-    <input type="hidden" name="databasename" value="{!! $databasename !!}"/>
-    <!-- <b>User Name</b><br> -->
-    <input type="hidden" name="username" value="{!! $username !!}"/>
-    <!-- <b>User Password</b><br> -->
-    <input type="hidden" name="password" value="{!! $password !!}"/>
-    <!-- <b>Port</b><br> -->
-    <input type="hidden" name="port" value="{!! $port !!}"/>
+        {!! Form::open( ['id'=>'form','method' => 'POST'] )!!}
+        {{-- <input type="hidden" name="_token" value="{{ csrf_token() }}"> --}}
+        <!-- <b>default</b><br> -->
+        <input type="hidden" name="default" value="{!! $default !!}"/>
+        <!-- <b>Host</b><br> -->
+        <input type="hidden"  name="host" value="{!! $host !!}"/>
+        <!-- <b>Database Name</b><br> -->
+        <input type="hidden" name="databasename" value="{!! $databasename !!}"/>
+        <!-- <b>User Name</b><br> -->
+        <input type="hidden" name="username" value="{!! $username !!}"/>
+        <!-- <b>User Password</b><br> -->
+        <input type="hidden" name="password" value="{!! $password !!}"/>
+        <!-- <b>Port</b><br> -->
+        <input type="hidden" name="port" value="{!! $port !!}"/>
+        <!-- Dummy data installation -->
+        <input type="hidden" name="dummy_install" value="{!! $dummy_install !!}"/>
 
-    <input type="submit" style="display:none;">
+        <input type="submit" style="display:none;">
 
-</form>
+        </form>
 
-    <div id="show" style="display:none;">
-        <div class="row">
-            <div class="col-md-2">
-            </div>
-            <div class="col-md-9">
-                <img src="{{asset("lb-faveo/media/images/gifloader.gif")}}"><br/><br/><br/>
+        <div id="show" style="display:none;">
+            <div class="row">
+                <div class="col-md-2">
+                </div>
+                <div class="col-md-9" style="text-align: center"id='loader' >
+                    <img src="{{asset("lb-faveo/media/images/gifloader.gif")}}"><br/><br/><br/>
+                </div>
             </div>
         </div>
-    </div>
 
-    <div style="border-bottom: 1px solid #eee;">
-        <p class="setup-actions step">
-            <a href="{{ URL::route('account') }}" class="pull-right" id="next" style="text-color:black"><input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue"> </a>
-            <a href="{{ URL::route('configuration') }}" class="button button-large button-next" style="float: left">Previous</a>
-        </p>
-    </div>
+        <div style="border-bottom: 1px solid #eee;">
+            <p class="setup-actions step" id="retry">
+                <a href="{{ URL::route('account') }}" class="pull-right" id="next" style="text-color:black"><input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue"> </a>
+                <a href="{{ URL::route('configuration') }}" class="button button-large button-next" style="float: left">Previous</a>
+            </p>
+        </div>
 
-<br/>
+        <br/>
 
-<script type="text/javascript">
-// submit a ticket
-$(document).ready(function () {
-    $("#form").submit();
-});
-    // Edit a ticket
-        $('#form').on('submit', function() {
+        <script type="text/javascript">
+        // submit a ticket
+        $(document).ready(function () {
+            $("#form").submit();
+        });
+        // Edit a ticket
+        $('#form').on('submit', function () {
             $.ajax({
-                type: "POST",
-                url: "{!! route('postconnection') !!}",
-                dataType: "html",
+                type: "GET",
+                url: "{!! url('create/env') !!}",
+                dataType: "json",
                 data: $(this).serialize(),
-                beforeSend: function() {
+                beforeSend: function () {
                     $("#conn").hide();
                     $("#show").show();
                     $("#wait").show();
                 },
-                success: function(response) {
-                    // $("#dismis").trigger("click");
-                    if (response == 1) {
-                        $("#show").hide();
-                        $("#wait").hide();
-                        $("#conn").show();
-                        // $("#next1").trigger("click");
-                    } else if (response == 0) {
-                        alert('Please check all your fields');
-                    }
+                success: function (response) {
+                    var data=response.result;
+                    console.log(data);
+                    var message = data.success;
+                    var next = data.next;
+                    var api = data.api;
+                    $('#submitme').attr('disabled','disabled');
+                    $('#wait').append('<ul><li>'+message+'</li><li class="seco">'+next+'...</li></ul>');
+                    callApi(api);
+                },
+                error: function(response){
+                    var data=response.responseJSON.result;
+                    $('#wait').append('<ul><li style="color:red">'+data.error+'</li></ul>');
+                    $('#loader').hide();
+                    $('#next').find('#submitme').hide();
+                    $('#retry').append('<input type="button" id="submitm" class="button-primary button button-large button-next" value="Retry" onclick="reload()">');
+                    
                 }
             })
             return false;
         });
-</script>
 
-<?php } else {?>
-    <div class="woocommerce-message woocommerce-tracker" >
+        function callApi(api) {
+            $.ajax({
+                type: "GET",
+                url: api,
+                dataType: "json",
+                data: $(this).serialize(),
+                success: function (response) {
+                    var data=response.result;
+                    console.log(data);
+                    var message = data.success;
+                    var next = data.next;
+                    var api = data.api;
+                    $("#wait").find('.seco').remove();
+                    $('#wait ul').append('<li>'+message+'</li><li class="seco">'+next+'...</li>');
+                    if (message == 'Database has been setup successfully.') {
+                        $('#loader').hide();
+                        $('#next').find('#submitme').show();
+                        $('#submitme').removeAttr('disabled');
+                        $('.seco').hide();
+                    } else {
+                        callApi(api);
+                    }
+                },
+                error: function(response){
+                    console.log(response);
+                    var data=response.responseJSON.result;
+                    $('#seco').append('<p style="color:red">'+data.error+'</p>');
+                    $('#loader').hide();
+                    $('#next').find('#submitme').hide();
+                    $('#retry').append('<input type="button" id="submitm" class="button-primary button button-large button-next" value="Retry" onclick="reload()">');
+                }
+            });
+        }
+        function reload(){
+            $('#retry').find('#submitm').remove();
+            $('#loader').show();
+            $('#wait').find('ol').remove();
+            $.ajax({
+                type: "GET",
+                url: "{!! url('create/env') !!}",
+                dataType: "json",
+                data: $(this).serialize(),
+                beforeSend: function () {
+                    $("#conn").hide();
+                    $("#show").show();
+                    $("#wait").show();
+                },
+                success: function (response) {
+                    var data=response.result;
+                    console.log(data);
+                    var message = data.success;
+                    var next = data.next;
+                    var api = data.api;
+                    $('#submitme').attr('disabled','disabled');
+                    $('#wait').append('<ul><li>'+message+'</li><li class="seco">'+next+'...</li></ul>');
+                    callApi(api);
+                },
+                error: function(response){
+                    var data=response.responseJSON.result;
+                    $('#wait').append('<ul><li style="color:red">'+data.error+'</li></ul>');
+                    $('#loader').hide();
+                    $('#next').find('#submitme').hide();
+                    $('#retry').append('<input type="button" id="submitm" class="button-primary button button-large button-next" value="Retry" onclick="reload()">');
+                    
+                }
+            })
+            
+        }
+        </script>
+
+    <?php } else { ?>
+        <div class="woocommerce-message woocommerce-tracker" >
             <p id="fail">Database connection unsuccessful. This system does not meet Faveo system requirements</p>
-            </div>
+        </div>
         <p>This either means that the username and password information is incorrect or we can&rsquo;t contact the database server. This could mean your host&rsquo;s database server is down.</p>
         <ul>
             <li>Are you sure you have the correct username and password?</li>
@@ -213,15 +299,15 @@ $(document).ready(function () {
         <p>If you&rsquo;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="http://www.ladybirdweb.com/support">Faveo Support </a>.</p>
 
 
-            <div  style="border-bottom: 1px solid #eee;">
-                @if(Cache::has('step4')) <?php Cache::forget('step4')?> @endif
-                <p class="setup-actions step">
-                    <input type="submit" id="submitme" class="button-danger button button-large button-next" style="background-color: #d43f3a;color:#fff;" value="continue" disabled>
-                    <a href="{{URL::route('configuration')}}" class="button button-large button-next" style="float: left;">Previous</a>
-                </p>
-            </div>
-            <br/><br/>
-      <?php } // if ?>
+        <div  style="border-bottom: 1px solid #eee;">
+            @if(Cache::has('step4')) <?php Cache::forget('step4') ?> @endif
+            <p class="setup-actions step">
+                <input type="button" id="submitme" class="button-danger button button-large button-next" style="background-color: #d43f3a;color:#fff;" value="continue" disabled>
+                <a href="{{URL::route('configuration')}}" class="button button-large button-next" style="float: left;">Previous</a>
+            </p>
+        </div>
+        <br/><br/>
+    <?php } // if  ?>
     <div id="legend">
         {{-- <ul> --}}
         <p class="setup-actions step">
@@ -231,6 +317,6 @@ $(document).ready(function () {
         </p>
         {{-- </ul> --}}
     </div>
-<?php } // if ?>
+<?php } // if  ?>
 
 @stop
\ No newline at end of file
diff --git a/resources/views/themes/default1/installer/helpdesk/view5.blade.php b/resources/views/themes/default1/installer/helpdesk/view5.blade.php
index c8d26b367..75753ffbf 100644
--- a/resources/views/themes/default1/installer/helpdesk/view5.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view5.blade.php
@@ -24,7 +24,7 @@ active
         
 
         <!-- checking if the form submit fails -->
-        @if($errors->first('firstname')||$errors->first('Lastname')||$errors->first('email')||$errors->first('username')||$errors->first('password')||$errors->first('confirmpassword'))
+        @if($errors->first('firstname')||$errors->first('Lastname')||$errors->first('email')||$errors->first('username')||$errors->first('password')||$errors->first('confirm_password'))
             <div class="woocommerce-message woocommerce-tracker">
                 <div class="fail">
                     @if($errors->first('firstname'))
@@ -42,8 +42,8 @@ active
                     @if($errors->first('password'))
                         <span id="fail">{!! $errors->first('password', ':message') !!}</span><br/>
                     @endif
-                    @if($errors->first('confirmpassword'))
-                        <span id="fail">{!! $errors->first('confirmpassword', ':message') !!}</span><br/><br/>
+                    @if($errors->first('confirm_password'))
+                        <span id="fail">{!! $errors->first('confirm_password', ':message') !!}</span><br/><br/>
                     @endif
                 </div>
             </div>        
@@ -319,7 +319,7 @@ active
                             ?>  
                                 <select name="language" data-placeholder="Choose a timezone..." class="chosen-select" style="width:295px;" tabindex="2">
                                     @foreach($values as $value)
-                                        <option value="{!! $value !!}">{!! Config::get('languages.' . $value) !!}</option>
+                                        <option value="{!! $value !!}">{!! Config::get('languages.' . $value)[0] !!}&nbsp;({!! Config::get('languages.' . $value)[1] !!})</option>
                                     @endforeach
                                 </select>
                            </div>
@@ -331,10 +331,6 @@ active
                     </tr>
                 </div>
             </table>
-            <input id="dummy-data" class="input-checkbox" type="checkbox" name="dummy-data">
-            <label for="dummy-data" style="color:#3AA7D9">Install dummy data</label>
-            <button type="button" data-toggle="popover" data-placement="right" data-arrowcolor="#eeeeee" data-bordercolor="#bbbbbb" data-title-backcolor="#cccccc" data-title-bordercolor="#bbbbbb" data-title-textcolor="#444444" data-content-backcolor="#eeeeee" data-content-textcolor="#888888" title="@{{DummyDataTitle}}" data-content="@{{DummyDataContent}}" style="padding: 0px;border: 0px; border-radius: 5px;"><i class="fa fa-question-circle" style="padding: 0px;"></i>
-                            </button>
             <br><br>
             <p class="setup-actions step">
                 <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Install">
@@ -352,7 +348,7 @@ active
             @if($errors->has('firstname'))
                 addErrorClass('firstname');
             @endif
-            @if($errors->has('Lastname'))
+            @if($errors->has('lastname'))
                 addErrorClass('Lastname');
             @endif
             @if($errors->has('email'))
@@ -369,7 +365,10 @@ active
             @endif
 
         $('#postaccount').on('submit', function(e) {
-            $("#postaccount input").each(function(){
+            $('#submitme').attr('disabled', true);
+            $('#submitme').val('Installing, please wait...');
+            $empty_field = 0;
+            $("#postaccount input").each(function() {
                 if($(this).attr('name') == 'firstname' ||
                    $(this).attr('name') == 'Lastname' ||
                    $(this).attr('name') == 'email' ||
@@ -379,13 +378,18 @@ active
                     if ($(this).val() == '') {
                         $(this).css('border-color','red')
                         $(this).css('border-width','1px');
-                        e.preventDefault();
+                        $empty_field = 1;
+                    } else {
+                        $empty_field = 0;
                     }
-                } else {
-                    $('#submitme').attr('disabled', true);
-                    $('#submitme').val('Installing, please wait...');
                 }
             });
+            if ($empty_field !=0 ) {
+                alert('Please fill all required values.');
+                e.preventDefault();
+                $('#submitme').attr('disabled', false);
+                $('#submitme').val('Install');
+            }
         });
 
         $('input').on('focus', function(){
diff --git a/resources/views/themes/default1/installer/helpdesk/view6.blade.php b/resources/views/themes/default1/installer/helpdesk/view6.blade.php
index db83d2343..95a2c2fe4 100644
--- a/resources/views/themes/default1/installer/helpdesk/view6.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view6.blade.php
@@ -26,30 +26,40 @@ active
             <img src="https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcQ-uhinU3OzXKj9zlFO7dFxHaChqyHPcWWg5nWgMqYt6N5b3knK" style="width: 86px; float: right;">
         </a>
 
-        <h1 style="text-align: center;">Your Helpdesk is Ready!</h1>
+        <h1 style="text-align: center;">{!! Lang::get('lang.your_helpdesk_is_ready') !!}</h1>
 <div class="woocommerce-message woocommerce-tracker">
-                <p>All right, sparky! You’ve made it through the installation.</p>
+                <p>{!! Lang::get('lang.all_right_sparky_you_have_made_it') !!}</p>
 
             </div>
 
 
         <div class="setup-next-steps">
             <div class="setup-next-steps-first">
-                <h2>Next Steps</h2>
+                <h2>{!! Lang::get('lang.next_step') !!}</h2>
                 <ul>
-                    <li class="setup-product"><a class="button button-primary button-large" href="{!! url('auth/login') !!}" style="float: none; text-align: center; font-size: 24px;    padding: 15px;     line-height: 1;">Login to Faveo</a>
+
+                @if(\Event::fire('helpdesk.apply.whitelabel'))
+         <li class="setup-product"><a class="button button-primary button-large" href="{!! url('auth/login') !!}" style="float: none; text-align: center; font-size: 24px;    padding: 15px;     line-height: 1;">{!! Lang::get('lang.login_to_helpdesk') !!}</a>
                     </li>
+        @else
+
+          <li class="setup-product"><a class="button button-primary button-large" href="{!! url('auth/login') !!}" style="float: none; text-align: center; font-size: 24px;    padding: 15px;     line-height: 1;">{!! Lang::get('lang.login_to_faveo') !!}</a>
+                    </li>
+            @endif
+
+                    
+
                 </ul>
             </div>
             <div class="setup-next-steps-last">
-                <h2>Learn More</h2>
+                <h2>{!! Lang::get('lang.learn_more') !!}</h2>
                 <ul>
-                    <li class="video-walkthrough"><a target="_blank" href="https://www.youtube.com/channel/UC-eqh-h241b1janp6sU7Iiw">Video walk through</a>
+                    <li class="video-walkthrough"><a target="_blank" href="https://www.youtube.com/channel/UC-eqh-h241b1janp6sU7Iiw">{!! Lang::get('lang.video_walk_through') !!}</a>
                     </li>
-                    <li class="sidekick"><a target="_blank" href="http://www.ladybirdweb.com/support/knowledgebase">Knowledge Base</a>
+                    <li class="sidekick"><a target="_blank" href="http://www.ladybirdweb.com/support/knowledgebase">{!! Lang::get('lang.knowledge_base') !!}</a>
                     </li>
 
-                    <li class="newsletter"><a href="mailto:support@ladybirdweb.com">Email Support</a>
+                    <li class="newsletter"><a href="mailto:support@ladybirdweb.com">{!! Lang::get('lang.email_support') !!}</a>
                     </li>
                     <br>
                     <br>
diff --git a/resources/views/themes/default1/installer/layout/installer.blade.php b/resources/views/themes/default1/installer/layout/installer.blade.php
index f9c6c0571..0d586f609 100644
--- a/resources/views/themes/default1/installer/layout/installer.blade.php
+++ b/resources/views/themes/default1/installer/layout/installer.blade.php
@@ -21,8 +21,8 @@
         <center><a href="http://www.faveohelpdesk.com">
             <img src="{{asset("lb-faveo/media/installer/faveo.png")}}" alt="faveo" width="250px"></a></center>
     <ol class="setup-steps">
-        <li class="@yield('license')">License Agreement</li>
         <li class="@yield('environment')">Environment Test</li>
+        <li class="@yield('license')">License Agreement</li>
         <li class="@yield('database')">Database Setup</li>
         <li class="@yield('locale')">Locale Information</li>
         <li class="@yield('ready')">Ready</li>
diff --git a/routes/installer.php b/routes/installer.php
index 48f351f45..c384f1d63 100644
--- a/routes/installer.php
+++ b/routes/installer.php
@@ -17,7 +17,7 @@ Route::get('/JavaScript-disabled', [
     'as'   => 'js-disabled',
     'uses' => 'Installer\helpdesk\InstallController@jsDisabled',
 ]);
-Route::get('/step1', [
+Route::get('/step2', [
     'as'   => 'licence',
     'uses' => 'Installer\helpdesk\InstallController@licence',
 ]);
@@ -25,7 +25,7 @@ Route::post('/step1post', [
     'as'   => 'postlicence',
     'uses' => 'Installer\helpdesk\InstallController@licencecheck',
 ]);
-Route::get('/step2', [
+Route::get('/step1', [
     'as'   => 'prerequisites',
     'uses' => 'Installer\helpdesk\InstallController@prerequisites',
 ]);