diff --git a/app/Ninja/Presenters/TaskPresenter.php b/app/Ninja/Presenters/TaskPresenter.php
index 28dd05d81846..7989aa4ff3e3 100644
--- a/app/Ninja/Presenters/TaskPresenter.php
+++ b/app/Ninja/Presenters/TaskPresenter.php
@@ -26,6 +26,11 @@ class TaskPresenter extends EntityPresenter
         return substr($this->entity->description, 0, 40) . (strlen($this->entity->description) > 40 ? '...' : '');
     }
 
+    public function project()
+    {
+        return $this->entity->project ? $this->entity->project->name : '';
+    }
+
     /**
      * @param $account
      * @return mixed
diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index b56d8b8183d6..85118334286c 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -66,11 +66,17 @@
                             ->addGroupClass('amount')
                             ->append('<span data-bind="html: expenseCurrencyCode"></span>') !!}
 
-                    {!! Former::select('client_id')
-                            ->addOption('', '')
-                            ->label(trans('texts.client'))
-                            ->data_bind('combobox: client_id')
-                            ->addGroupClass('client-select') !!}
+                    @if ($expense && $expense->invoice_id)
+                        {!! Former::plaintext()
+                                ->label('client')
+                                ->value($expense->client->getDisplayName()) !!}
+                    @else
+                        {!! Former::select('client_id')
+                                ->addOption('', '')
+                                ->label(trans('texts.client'))
+                                ->data_bind('combobox: client_id')
+                                ->addGroupClass('client-select') !!}
+                    @endif
 
                     @if (!$expense || ($expense && !$expense->invoice_id && !$expense->client_id))
                         {!! Former::checkbox('should_be_invoiced')
diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index 9e22ff76c1e1..2cbf979fc781 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -47,9 +47,21 @@
             <div class="panel panel-default">
             <div class="panel-body">
 
-            {!! Former::select('client')->addOption('', '')->addGroupClass('client-select') !!}
-            {!! Former::select('project_id')->addOption('', '')->addGroupClass('project-select')
-                    ->label(trans('texts.project')) !!}
+            @if ($task && $task->invoice_id)
+                {!! Former::plaintext()
+                        ->label('client')
+                        ->value($task->client->getDisplayName()) !!}
+                @if ($task->project)
+                    {!! Former::plaintext()
+                            ->label('project')
+                            ->value($task->present()->project) !!}
+                @endif
+            @else
+                {!! Former::select('client')->addOption('', '')->addGroupClass('client-select') !!}
+                {!! Former::select('project_id')->addOption('', '')->addGroupClass('project-select')
+                        ->label(trans('texts.project')) !!}
+            @endif
+
             {!! Former::textarea('description')->rows(3) !!}
 
             @if ($task)