diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 62d9d8ff62be..c5f3c8542291 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -129,8 +129,7 @@ class AccountController extends BaseController
         Auth::login($user, true);
         event(new UserSignedUp());
 
-        $redirectTo = Input::get('redirect_to') ?: 'invoices/create';
-
+        $redirectTo = Input::get('redirect_to') ? SITE_URL . '/' . ltrim(Input::get('redirect_to'), '/') : 'invoices/create';
         return Redirect::to($redirectTo)->with('sign_up', Input::get('sign_up'));
     }
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 7948d210e27b..6672944bc0ec 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -71,8 +71,7 @@ class HomeController extends BaseController
         }
 
         if (Auth::check()) {
-            $redirectTo = Input::get('redirect_to', 'invoices/create');
-
+            $redirectTo = Input::get('redirect_to') ? SITE_URL . '/' . ltrim(Input::get('redirect_to'), '/') : 'invoices/create';
             return Redirect::to($redirectTo)->with('sign_up', Input::get('sign_up'));
         } else {
             return View::make('public.invoice_now');
diff --git a/app/Services/AuthService.php b/app/Services/AuthService.php
index b07758c4e71c..8490c0f163cc 100644
--- a/app/Services/AuthService.php
+++ b/app/Services/AuthService.php
@@ -94,7 +94,7 @@ class AuthService
             }
         }
 
-        $redirectTo = Input::get('redirect_to') ?: 'dashboard';
+        $redirectTo = Input::get('redirect_to') ? SITE_URL . '/' . ltrim(Input::get('redirect_to'), '/') : 'dashboard';
 
         return redirect()->to($redirectTo);
     }