diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index b9e214172944..acb0ab6796f1 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -291,7 +291,7 @@ return array(
   
   // Pro Plan
   'pro_plan' => [
-    'remove_logo' => ':link to remove the Invoice Ninja logo by joining the pro plan',
+    'remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'remove_logo_link' => 'Click here',
   ],
 
diff --git a/app/ninja/repositories/TaxRateRepository.php b/app/ninja/repositories/TaxRateRepository.php
index b7a7e4f9eb3b..a6cc5616498c 100755
--- a/app/ninja/repositories/TaxRateRepository.php
+++ b/app/ninja/repositories/TaxRateRepository.php
@@ -16,7 +16,7 @@ class TaxRateRepository
 				continue;
 			}
 
-			if (!Utils::parseFloat($record->rate) || !trim($record->name))
+			if (!isset($record->name) || !Utils::parseFloat($record->rate) || !trim($record->name))
 			{
 				continue;
 			}
diff --git a/app/routes.php b/app/routes.php
index 4a5f4a54cf84..671595fab36e 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -60,12 +60,12 @@ Route::group(array('before' => 'auth'), function()
   Route::get('force_inline_pdf', 'UserController@forcePDFJS');
 
 	Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData'));
-  Route::get('account/enable_pro_plan', 'AccountController@enableProPlan');
-	Route::get('company/{section?}', 'AccountController@showSection');	
+  Route::get('company/{section?}', 'AccountController@showSection');	
 	Route::post('company/{section?}', 'AccountController@doSection');
 	Route::post('user/setTheme', 'UserController@setTheme');
   Route::post('remove_logo', 'AccountController@removeLogo');
-
+  Route::post('account/go_pro', 'AccountController@enableProPlan');
+  
 	Route::resource('clients', 'ClientController');
 	Route::get('api/clients', array('as'=>'api.clients', 'uses'=>'ClientController@getDatatable'));
 	Route::get('api/activities/{client_id?}', array('as'=>'api.activities', 'uses'=>'ActivityController@getDatatable'));	
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 20a7b9ae72eb..8131abcbb4e4 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -286,7 +286,7 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
 
       <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">	      	
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }} <i class="glyphicon glyphicon-remove-circle"></i></button>
-        <button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()" disabled>{{ trans('texts.save') }} <i class="glyphicon glyphicon-floppy-disk"></i></button>	      	
+        <button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()" disabled>{{ trans('texts.save') }} <i class="glyphicon glyphicon-floppy-disk"></i></button>
       </div>
     </div>
   </div>
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 652ae40bbfe1..00c4d3a2a9b4 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -274,8 +274,9 @@
 	<iframe id="theFrame" style="display:none" frameborder="1" width="100%" height="1180"></iframe>
 	<canvas id="theCanvas" style="display:none;width:100%;border:solid 1px #CCCCCC;"></canvas>
 
-	@if (false && !Auth::user()->isPro())
-		{{ trans('texts.pro_plan.remove_logo', ['link'=>link_to('account/enable_pro_plan', trans('texts.pro_plan.remove_logo_link'))]) }}		
+	@if (!Auth::user()->isPro())
+		<a href="#" onclick="showProPlan()">{{ trans('texts.pro_plan.remove_logo_link') }}</a>
+		{{ trans('texts.pro_plan.remove_logo') }}
 	@endif
 
 	<div class="modal fade" id="clientModal" tabindex="-1" role="dialog" aria-labelledby="clientModalLabel" aria-hidden="true">
@@ -423,16 +424,40 @@
 		</div>
 
 	     <div class="modal-footer" style="margin-top: 0px">
-	      	<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+	      	<button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button>
 	     </div>
 	  		
 	    </div>
 	  </div>
 	</div>
 
-
-
 	{{ Former::close() }}
+
+
+	{{ Former::open('account/go_pro') }}	      
+	<div class="modal fade" id="proPlanModal" tabindex="-1" role="dialog" aria-labelledby="proPlanModalLabel" aria-hidden="true">
+	  <div class="modal-dialog" style="min-width:150px">
+	    <div class="modal-content">
+	      <div class="modal-header">
+	        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+	        <h4 class="modal-title" id="proPlanModalLabel">{{ trans('texts.sign_up') }}</h4>
+	      </div>
+
+		    <div style="background-color: #fff; padding-left: 16px; padding-right: 16px">
+		    	&nbsp; 
+
+		    	&nbsp;
+				</div>
+
+	     <div class="modal-footer" style="margin-top: 0px">
+	      	<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button>	      	
+	      	{{ Button::primary_submit(trans('texts.sign_up')) }}	      		      	
+	     </div>	  	
+	    </div>
+	  </div>
+	</div>
+	{{ Former::close() }}
+
 	</div>
 
 	<script type="text/javascript">
@@ -445,6 +470,10 @@
 		$('#recurringModal').modal('show');			
 	}
 
+	function showProPlan() {
+		$('#proPlanModal').modal('show');				
+	}
+
 	$(function() {
 
 		$('#country_id').combobox().on('change', function(e) {