diff --git a/app/controllers/TokenController.php b/app/controllers/TokenController.php
index c472cc6d2b83..ba7924d49479 100755
--- a/app/controllers/TokenController.php
+++ b/app/controllers/TokenController.php
@@ -116,43 +116,45 @@ class TokenController extends BaseController
      */
     public function save($tokenPublicId = false)
     {
-        $rules = [
-            'name' => 'required',
-        ];
+        if (Auth::user()->account->isPro()) {
+            $rules = [
+                'name' => 'required',
+            ];
 
-        if ($tokenPublicId) {
-            $token = AccountToken::where('account_id', '=', Auth::user()->account_id)
-                        ->where('public_id', '=', $tokenPublicId)->firstOrFail();
+            if ($tokenPublicId) {
+                $token = AccountToken::where('account_id', '=', Auth::user()->account_id)
+                            ->where('public_id', '=', $tokenPublicId)->firstOrFail();
+            }
+
+            $validator = Validator::make(Input::all(), $rules);
+
+            if ($validator->fails()) {
+                return Redirect::to($tokenPublicId ? 'tokens/edit' : 'tokens/create')->withInput()->withErrors($validator);
+            }
+
+            if ($tokenPublicId) {
+                $token->name = trim(Input::get('name'));
+            } else {
+                $lastToken = AccountToken::withTrashed()->where('account_id', '=', Auth::user()->account_id)
+                            ->orderBy('public_id', 'DESC')->first();
+
+                $token = AccountToken::createNew();
+                $token->name = trim(Input::get('name'));
+                $token->token = str_random(RANDOM_KEY_LENGTH);
+                $token->public_id = $lastToken ? $lastToken->public_id + 1 : 1;
+            }
+
+            $token->save();
+
+            if ($tokenPublicId) {
+                $message = trans('texts.updated_token');
+            } else {
+                $message = trans('texts.created_token');
+            }
+
+            Session::flash('message', $message);
         }
 
-        $validator = Validator::make(Input::all(), $rules);
-
-        if ($validator->fails()) {
-            return Redirect::to($tokenPublicId ? 'tokens/edit' : 'tokens/create')->withInput()->withErrors($validator);
-        }
-
-        if ($tokenPublicId) {
-            $token->name = trim(Input::get('name'));
-        } else {
-            $lastToken = AccountToken::withTrashed()->where('account_id', '=', Auth::user()->account_id)
-                        ->orderBy('public_id', 'DESC')->first();
-
-            $token = AccountToken::createNew();
-            $token->name = trim(Input::get('name'));
-            $token->token = str_random(RANDOM_KEY_LENGTH);            
-            $token->public_id = $lastToken ? $lastToken->public_id + 1 : 1;
-        }
-
-        $token->save();
-
-        if ($tokenPublicId) {
-            $message = trans('texts.updated_token');
-        } else {
-            $message = trans('texts.created_token');
-        }
-
-        Session::flash('message', $message);
-
         return Redirect::to('company/advanced_settings/token_management');
     }
 
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index ec6b701c29e3..931eae529052 100755
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -183,58 +183,60 @@ class UserController extends BaseController
      */
     public function save($userPublicId = false)
     {
-        $rules = [
-            'first_name' => 'required',
-            'last_name' => 'required',
-        ];
+        if (Auth::user()->account->isPro()) {
+            $rules = [
+                'first_name' => 'required',
+                'last_name' => 'required',
+            ];
 
-        if ($userPublicId) {
-            $user = User::where('account_id', '=', Auth::user()->account_id)
-                        ->where('public_id', '=', $userPublicId)->firstOrFail();
+            if ($userPublicId) {
+                $user = User::where('account_id', '=', Auth::user()->account_id)
+                            ->where('public_id', '=', $userPublicId)->firstOrFail();
 
-            $rules['email'] = 'required|email|unique:users,email,'.$user->id.',id';
-        } else {
-            $rules['email'] = 'required|email|unique:users';
+                $rules['email'] = 'required|email|unique:users,email,'.$user->id.',id';
+            } else {
+                $rules['email'] = 'required|email|unique:users';
+            }
+
+            $validator = Validator::make(Input::all(), $rules);
+
+            if ($validator->fails()) {
+                return Redirect::to($userPublicId ? 'users/edit' : 'users/create')->withInput()->withErrors($validator);
+            }
+
+            if ($userPublicId) {
+                $user->first_name = trim(Input::get('first_name'));
+                $user->last_name = trim(Input::get('last_name'));
+                $user->username = trim(Input::get('email'));
+                $user->email = trim(Input::get('email'));
+            } else {
+                $lastUser = User::withTrashed()->where('account_id', '=', Auth::user()->account_id)
+                            ->orderBy('public_id', 'DESC')->first();
+
+                $user = new User();
+                $user->account_id = Auth::user()->account_id;
+                $user->first_name = trim(Input::get('first_name'));
+                $user->last_name = trim(Input::get('last_name'));
+                $user->username = trim(Input::get('email'));
+                $user->email = trim(Input::get('email'));
+                $user->registered = true;
+                $user->password = str_random(RANDOM_KEY_LENGTH);
+                $user->password_confirmation = $user->password;
+                $user->public_id = $lastUser->public_id + 1;
+            }
+
+            $user->save();
+
+            if (!$user->confirmed) {
+                $this->userMailer->sendConfirmation($user, Auth::user());
+                $message = trans('texts.sent_invite');
+            } else {
+                $message = trans('texts.updated_user');
+            }
+
+            Session::flash('message', $message);
         }
-
-        $validator = Validator::make(Input::all(), $rules);
-
-        if ($validator->fails()) {
-            return Redirect::to($userPublicId ? 'users/edit' : 'users/create')->withInput()->withErrors($validator);
-        }
-
-        if ($userPublicId) {
-            $user->first_name = trim(Input::get('first_name'));
-            $user->last_name = trim(Input::get('last_name'));
-            $user->username = trim(Input::get('email'));
-            $user->email = trim(Input::get('email'));
-        } else {
-            $lastUser = User::withTrashed()->where('account_id', '=', Auth::user()->account_id)
-                        ->orderBy('public_id', 'DESC')->first();
-
-            $user = new User();
-            $user->account_id = Auth::user()->account_id;
-            $user->first_name = trim(Input::get('first_name'));
-            $user->last_name = trim(Input::get('last_name'));
-            $user->username = trim(Input::get('email'));
-            $user->email = trim(Input::get('email'));
-            $user->registered = true;
-            $user->password = str_random(RANDOM_KEY_LENGTH);
-            $user->password_confirmation = $user->password;
-            $user->public_id = $lastUser->public_id + 1;
-        }
-
-        $user->save();
-
-        if (!$user->confirmed) {
-            $this->userMailer->sendConfirmation($user, Auth::user());
-            $message = trans('texts.sent_invite');
-        } else {
-            $message = trans('texts.updated_user');
-        }
-
-        Session::flash('message', $message);
-
+        
         return Redirect::to('company/advanced_settings/user_management');
     }
 
diff --git a/app/lang/da/texts.php b/app/lang/da/texts.php
index b9fe647bc5fd..c9bb24e2dbf7 100644
--- a/app/lang/da/texts.php
+++ b/app/lang/da/texts.php
@@ -545,6 +545,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index baae707b2683..9b625600c51f 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -535,6 +535,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 78077cb34e31..f15f14e5e85c 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -543,9 +543,9 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
-  
 
 );
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index c1656cdd6207..76aac6f70da1 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -515,9 +515,9 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
 
-
 );
\ No newline at end of file
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index feb611dffa1a..3ca233cf043c 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -536,6 +536,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index 418acd0aed32..7fa241629f23 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -538,6 +538,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php
index 194a88af5868..d0985358a938 100644
--- a/app/lang/lt/texts.php
+++ b/app/lang/lt/texts.php
@@ -546,6 +546,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php
index c90260274b40..25a3109460db 100644
--- a/app/lang/nb_NO/texts.php
+++ b/app/lang/nb_NO/texts.php
@@ -544,6 +544,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 961228fbe10c..e9f4e7d5abc8 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -539,6 +539,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index b194ed7538ea..079721e4d925 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -526,6 +526,7 @@ return array(
   'show_deleted_tokens' => 'Show deleted tokens',
   'deleted_token' => 'Successfully deleted token',
   'created_token' => 'Successfully created token',
+  'updated_token' => 'Successfully updated token',
   'edit_token' => 'Edit Token',
   'delete_token' => 'Delete Token',
   'token' => 'Token',