diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index fb8742f3c41b..553df8dae94d 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -140,7 +140,12 @@ class AccountController extends BaseController
             Session::flash('warning', $message);
         }
 
-        $redirectTo = Input::get('redirect_to') ? SITE_URL . '/' . ltrim(Input::get('redirect_to'), '/') : 'dashboard';
+        if ($redirectTo = Input::get('redirect_to')) {
+            $redirectTo = SITE_URL . '/' . ltrim($redirectTo, '/');
+        } else {
+            $redirectTo = Input::get('sign_up') ? 'dashboard' : 'invoices/create';
+        }
+
         return Redirect::to($redirectTo)->with('sign_up', Input::get('sign_up'));
     }
 
diff --git a/resources/views/partials/sign_up.blade.php b/resources/views/partials/sign_up.blade.php
index d4e5bf119e5c..f5aeb7931513 100644
--- a/resources/views/partials/sign_up.blade.php
+++ b/resources/views/partials/sign_up.blade.php
@@ -293,7 +293,7 @@
     </div>
   </div>
 </div>
-
+@endif
 
 <div class="modal fade" id="logoutModal" tabindex="-1" role="dialog" aria-labelledby="logoutModalLabel" aria-hidden="true">
   <div class="modal-dialog">
@@ -319,4 +319,3 @@
     </div>
   </div>
 </div>
-@endif