diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php
index e19db323941f..42124b5afaf8 100644
--- a/resources/views/clients/edit.blade.php
+++ b/resources/views/clients/edit.blade.php
@@ -5,7 +5,7 @@
 @stop
 
 @section('head')
-	@if (config('ninja.google_maps_enabled'))
+	@if (config('ninja.google_maps_api_key'))
 		@include('partials.google_geocode')
 	@endif
 @stop
@@ -94,7 +94,7 @@
 						{!! Former::text('city') !!}
 						{!! Former::text('state') !!}
 						{!! Former::text('postal_code')
-								->oninput(config('ninja.google_maps_enabled') ? 'lookupPostalCode()' : '') !!}
+								->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
 						{!! Former::select('country_id')->addOption('','')
 							->fromQuery($countries, 'name', 'id') !!}
 
@@ -112,7 +112,7 @@
 						{!! Former::text('shipping_city')->label('city') !!}
 						{!! Former::text('shipping_state')->label('state') !!}
 						{!! Former::text('shipping_postal_code')
-								->oninput(config('ninja.google_maps_enabled') ? 'lookupPostalCode(true)' : '')
+								->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode(true)' : '')
 								->label('postal_code') !!}
 						{!! Former::select('shipping_country_id')->addOption('','')
 							->fromQuery($countries, 'name', 'id')->label('country_id') !!}
@@ -204,9 +204,11 @@
 						<li role="presentation">
 							<a href="#notes" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.notes') }}</a>
 						</li>
-						<li role="presentation">
-                            <a href="#messages" aria-controls="messages" role="tab" data-toggle="tab">{{ trans('texts.messages') }}</a>
-                        </li>
+						@if (Utils::isPro())
+							<li role="presentation">
+	                            <a href="#messages" aria-controls="messages" role="tab" data-toggle="tab">{{ trans('texts.messages') }}</a>
+	                        </li>
+						@endif
 						<li role="presentation">
 							<a href="#classify" aria-controls="classify" role="tab" data-toggle="tab">{{ trans('texts.classify') }}</a>
 						</li>
@@ -244,13 +246,15 @@
 						{!! Former::textarea('public_notes')->rows(6) !!}
 						{!! Former::textarea('private_notes')->rows(6) !!}
 					</div>
-					<div role="tabpanel" class="tab-pane" id="messages">
-						@foreach (App\Models\Account::$customMessageTypes as $type)
-							{!! Former::textarea('custom_messages[' . $type . ']')
-									->placeholder($account->customMessage($type))
-									->label($type) !!}
-						@endforeach
-					</div>
+					@if (Utils::isPro())
+						<div role="tabpanel" class="tab-pane" id="messages">
+							@foreach (App\Models\Account::$customMessageTypes as $type)
+								{!! Former::textarea('custom_messages[' . $type . ']')
+										->placeholder($account->customMessage($type))
+										->label($type) !!}
+							@endforeach
+						</div>
+					@endif
 					<div role="tabpanel" class="tab-pane" id="classify">
 						{!! Former::select('size_id')->addOption('','')
 							->fromQuery($sizes, 'name', 'id') !!}