diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index fc96d9859..dbe2d7dd5 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -51,6 +51,7 @@ class ProjectController extends BaseController
     public function create(ProjectRequest $request)
     {
         $data = [
+            'account' => auth()->user()->account,
             'project' => null,
             'method' => 'POST',
             'url' => 'projects',
@@ -67,6 +68,7 @@ class ProjectController extends BaseController
         $project = $request->entity();
 
         $data = [
+            'account' => auth()->user()->account,
             'project' => $project,
             'method' => 'PUT',
             'url' => 'projects/' . $project->public_id,
diff --git a/app/Ninja/Presenters/AccountPresenter.php b/app/Ninja/Presenters/AccountPresenter.php
index 21f662284..b3f3e07ad 100644
--- a/app/Ninja/Presenters/AccountPresenter.php
+++ b/app/Ninja/Presenters/AccountPresenter.php
@@ -52,6 +52,18 @@ class AccountPresenter extends Presenter
         return Utils::addHttp($this->entity->website);
     }
 
+    /**
+     * @return string
+     */
+    public function taskRate()
+    {
+        if ($this->entity->task_rate) {
+            return Utils::roundSignificant($this->entity->task_rate);
+        } else {
+            return '';
+        }
+    }
+
     /**
      * @return mixed
      */
diff --git a/app/Ninja/Presenters/ClientPresenter.php b/app/Ninja/Presenters/ClientPresenter.php
index 88353ac88..6bc87ebb4 100644
--- a/app/Ninja/Presenters/ClientPresenter.php
+++ b/app/Ninja/Presenters/ClientPresenter.php
@@ -50,4 +50,16 @@ class ClientPresenter extends EntityPresenter
 
         return sprintf('%s: %s %s', trans('texts.payment_terms'), trans('texts.payment_terms_net'), $client->defaultDaysDue());
     }
+
+    /**
+     * @return string
+     */
+    public function taskRate()
+    {
+      if ($this->entity->task_rate) {
+          return Utils::roundSignificant($this->entity->task_rate);
+      } else {
+          return '';
+      }
+    }
 }
diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php
index 289793590..32c091fbb 100644
--- a/resources/views/clients/edit.blade.php
+++ b/resources/views/clients/edit.blade.php
@@ -158,6 +158,7 @@
                 ->help(trans('texts.payment_terms_help')) !!}
 			@if ($account->isModuleEnabled(ENTITY_TASK))
 				{!! Former::text('task_rate')
+						->placeholder($account->present()->taskRate)
 						->help('task_rate_help') !!}
 			@endif
 			{!! Former::select('size_id')->addOption('','')
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index 894b21129..4cb4778d0 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -41,6 +41,7 @@
                 {!! Former::text('name') !!}
 
 				{!! Former::text('task_rate')
+						->placeholder($project && $project->client->task_rate ? $project->client->present()->taskRate : $account->present()->taskRate)
 				 		->help('task_rate_help') !!}
 
             </div>
@@ -65,11 +66,13 @@
     <script>
 
 		var clients = {!! $clients !!};
+		var clientMap = {};
 
         $(function() {
 			var $clientSelect = $('select#client_id');
             for (var i=0; i<clients.length; i++) {
                 var client = clients[i];
+								clientMap[client.public_id] = client;
                 var clientName = getClientDisplayName(client);
                 if (!clientName) {
                     continue;
@@ -80,7 +83,15 @@
 				$clientSelect.val({{ $clientPublicId }});
 			@endif
 
-			$clientSelect.combobox({highlighter: comboboxHighlighter});
+			$clientSelect.combobox({highlighter: comboboxHighlighter}).change(function() {
+				var client = clientMap[$('#client_id').val()];
+				if (client && parseFloat(client.task_rate)) {
+					var rate = client.task_rate;
+				} else {
+					var rate = {{ $account->present()->taskRate }};
+				}
+				$('#task_rate').attr('placeholder', roundSignificant(rate));
+			});
 
 			@if ($clientPublicId)
 				$('#name').focus();