diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 888b6e3b37..9dfc4f81ff 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -26,8 +26,10 @@ class AccountController extends \BaseController
             'initial'       => [],
             'cash'          => []
         ];
+        $total = $all->count();
 
         foreach ($all as $account) {
+
             switch ($account->accounttype->description) {
                 case 'Default account':
                     $list['personal'][] = $account;
@@ -45,7 +47,7 @@ class AccountController extends \BaseController
             }
         }
 
-        return View::make('accounts.index')->with('accounts', $list);
+        return View::make('accounts.index')->with('accounts', $list)->with('total',$total);
     }
 //
 //
diff --git a/app/views/accounts/create.blade.php b/app/views/accounts/create.blade.php
index 0be135e733..63b499ced8 100644
--- a/app/views/accounts/create.blade.php
+++ b/app/views/accounts/create.blade.php
@@ -2,7 +2,7 @@
 @section('content')
 <div class="row">
     <div class="col-lg-8 col-md-8 col-sm-12">
-        <h1>Firefly<br/>
+        <h1>Firefly
             <small>Add a new account</small>
         </h1>
         <p class="lead">
@@ -15,7 +15,7 @@
             a positive balance).
         </p>
         <p>
-            Your first account should be a checking or savings account. Enter its name and if relevant
+            If this is your first account, it should be a checking or savings account. Enter its name and if relevant
             the current balance. Check your bank statements for the last current balance you can find.
         </p>
         {{Form::open(['class' => 'form-horizontal','url' => route('accounts.store')])}}
diff --git a/app/views/accounts/index.blade.php b/app/views/accounts/index.blade.php
index a829ee1346..9ed88a043b 100644
--- a/app/views/accounts/index.blade.php
+++ b/app/views/accounts/index.blade.php
@@ -15,33 +15,37 @@
 </div>
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h3>Your accounts</h3>
-        <p style="width:50%;" class="text-info">
-            These are your personal accounts.
-        </p>
+        @if($total > 0)
+            <h3>Your accounts</h3>
+            <p style="width:50%;" class="text-info">
+                These are your personal accounts.
+            </p>
 
-        @include('accounts.list',['accounts' => $accounts['personal']])
+            @include('accounts.list',['accounts' => $accounts['personal']])
 
-        <h3>Beneficiaries</h3>
-        <p style="width:50%;" class="text-info">
-            These are beneficiaries; places where you spend money or people who pay you.
-        </p>
+            <h3>Beneficiaries</h3>
+            <p style="width:50%;" class="text-info">
+                These are beneficiaries; places where you spend money or people who pay you.
+            </p>
 
-        @include('accounts.list',['accounts' => $accounts['beneficiaries']])
+            @include('accounts.list',['accounts' => $accounts['beneficiaries']])
 
-        <h3>Initial balances</h3>
-        <p style="width:50%;" class="text-info">
-            These are system accounts; created to add balance to the books when you add a personal account
-            which already has money in it. That money has to come from somewhere.
-        </p>
-        @include('accounts.list',['accounts' => $accounts['initial']])
+            <h3>Initial balances</h3>
+            <p style="width:50%;" class="text-info">
+                These are system accounts; created to add balance to the books when you add a personal account
+                which already has money in it. That money has to come from somewhere.
+            </p>
+            @include('accounts.list',['accounts' => $accounts['initial']])
 
-        <h3>Cash</h3>
-        <p style="width:50%;" class="text-info">
-            This is a system account. When you don't specify a beneficiary or draw many from an ATM (or put cash in your
-            personal accounts) it gets added or drawn from this account.
-        </p>
+            <h3>Cash</h3>
+            <p style="width:50%;" class="text-info">
+                This is a system account. When you don't specify a beneficiary or draw many from an ATM (or put cash in your
+                personal accounts) it gets added or drawn from this account.
+            </p>
         @include('accounts.list',['accounts' => $accounts['cash']])
+        @else
+            <a href="{{route('accounts.create')}}" class="btn btn-lg btn-info">Create a new account</a>
+        @endif
     </div>
 </div>