diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 454b9d357c58..8d8c829920fa 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -613,11 +613,12 @@ class AccountController extends BaseController
             $iframeURL = rtrim($iframeURL, "/");
 
             $subdomain = preg_replace('/[^a-zA-Z0-9_\-\.]/', '', substr(strtolower(Input::get('subdomain')), 0, MAX_SUBDOMAIN_LENGTH));
-            if ($iframeURL || !$subdomain || in_array($subdomain, ['www', 'app', 'mail', 'admin', 'blog', 'user', 'contact', 'payment', 'payments', 'billing', 'invoice', 'business', 'owner'])) {
+            if ($iframeURL) {
                 $subdomain = null;
             }
             if ($subdomain) {
-                $rules['subdomain'] = "unique:accounts,subdomain,{$user->account_id},id";
+                $exclude = ['www', 'app', 'mail', 'admin', 'blog', 'user', 'contact', 'payment', 'payments', 'billing', 'invoice', 'business', 'owner', 'info', 'ninja'];
+                $rules['subdomain'] = "unique:accounts,subdomain,{$user->account_id},id|not_in:" . implode(',', $exclude);
             }
 
             $validator = Validator::make(Input::all(), $rules);
diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 0ec584aaf05c..606374a0d5de 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -245,7 +245,6 @@ class AppController extends BaseController
                 set_time_limit(60 * 5);
                 Cache::flush();
                 Session::flush();
-                Artisan::call('optimize', array('--force' => true));
                 Artisan::call('migrate', array('--force' => true));
                 foreach ([
                     'PaymentLibraries',
@@ -255,6 +254,7 @@ class AppController extends BaseController
                 ] as $seeder) {
                     Artisan::call('db:seed', array('--force' => true, '--class' => "{$seeder}Seeder"));
                 }
+                Artisan::call('optimize', array('--force' => true));
                 Event::fire(new UserSettingsChanged());
                 Session::flash('message', trans('texts.processed_updates'));
             } catch (Exception $e) {
diff --git a/app/Http/Requests/CreateVendorRequest.php b/app/Http/Requests/CreateVendorRequest.php
index 7186077fc666..d901f9e481c8 100644
--- a/app/Http/Requests/CreateVendorRequest.php
+++ b/app/Http/Requests/CreateVendorRequest.php
@@ -23,10 +23,11 @@ class CreateVendorRequest extends Request
     public function rules()
     {
         return [
-            'vendorcontacts' => 'valid_contacts',
+            'name' => 'required',
         ];
     }
 
+    /*
     public function validator($factory)
     {
         // support submiting the form with a single contact record
@@ -41,4 +42,5 @@ class CreateVendorRequest extends Request
             $this->input(), $this->container->call([$this, 'rules']), $this->messages()
         );
     }
+    */
 }
diff --git a/app/Http/Requests/UpdateVendorRequest.php b/app/Http/Requests/UpdateVendorRequest.php
index 568166735d8c..6e17b79bf12b 100644
--- a/app/Http/Requests/UpdateVendorRequest.php
+++ b/app/Http/Requests/UpdateVendorRequest.php
@@ -23,7 +23,7 @@ class UpdateVendorRequest extends Request
     public function rules()
     {
         return [
-            'vendor_contacts' => 'valid_contacts',
+            'name' => 'required',
         ];
     }
 }
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 6f209543322c..89684f78ec03 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1130,7 +1130,7 @@ return array(
     'info' => 'Info',
     'imported_expenses' => 'Successfully created :count_vendors vendor(s) and :count_expenses expense(s)',
 
-    'iframe_url_help3' => 'Note: if you plan on accepting credit cards we strongly recommend having HTTPS enabled on your site.',
+    'iframe_url_help3' => 'Note: if you plan on accepting credit cards details we strongly recommend enabling HTTPS on your site.',
     'expense_error_multiple_currencies' => 'The expenses can\'t have different currencies.',
     'expense_error_mismatch_currencies' => 'The client\'s currency does not match the expense currency.',
     'trello_roadmap' => 'Trello Roadmap',
diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php
index 348f51a792d6..91f70886a9fa 100644
--- a/resources/views/accounts/email_settings.blade.php
+++ b/resources/views/accounts/email_settings.blade.php
@@ -100,7 +100,7 @@
                 <div class="modal-body">
                     <p>{{ trans('texts.iframe_url_help1') }}</p>
                     <pre>&lt;center&gt;
-    &lt;iframe id="invoiceIFrame" width="1000" height="1200"&gt;&lt;/iframe&gt;
+    &lt;iframe id="invoiceIFrame" width="100%" height="1200" style="max-width:1000px"&gt;&lt;/iframe&gt;
 &lt;center&gt;
 &lt;script language="javascript"&gt;
     var iframe = document.getElementById('invoiceIFrame');
diff --git a/resources/views/vendors/edit.blade.php b/resources/views/vendors/edit.blade.php
index e0286c8d5366..b5eb2a8c5fa3 100644
--- a/resources/views/vendors/edit.blade.php
+++ b/resources/views/vendors/edit.blade.php
@@ -15,9 +15,10 @@
 
 	{!! Former::open($url)
             ->autocomplete('off')
-            ->rules(
-                ['email' => 'email']
-            )->addClass('col-md-12 warn-on-exit')
+            ->rules([
+                'namey' => 'required',
+                'email' => 'email'
+            ])->addClass('col-md-12 warn-on-exit')
             ->method($method) !!}
 
     @include('partials.autocomplete_fix')