diff --git a/.gitignore b/.gitignore
index a344f570bfdb..294af63cfb98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@
 /ninja.sublime-workspace
 /tests/_log
 .idea
-.project
\ No newline at end of file
+.project
+/nbproject/private/
\ No newline at end of file
diff --git a/app/filters.php b/app/filters.php
index cd9f00324e9a..d5364d804cb9 100755
--- a/app/filters.php
+++ b/app/filters.php
@@ -66,7 +66,13 @@ App::after(function($request, $response)
 
 Route::filter('auth', function()
 {
-	if (Auth::guest()) return Redirect::guest('/');
+    if (Auth::guest()) {
+        if(Utils::isNinja()) {
+            return Redirect::guest('/');
+        } else {
+            return Redirect::guest('/login');
+        }
+    }
 });
 
 
diff --git a/app/libraries/utils.php b/app/libraries/utils.php
index a1278bf11271..c2fe77501abd 100755
--- a/app/libraries/utils.php
+++ b/app/libraries/utils.php
@@ -36,7 +36,7 @@ class Utils
 	{
 		return isset($_ENV['DISABLE_REGISTRATION']) && $_ENV['DISABLE_REGISTRATION'];	
 	}
-
+        
 	public static function isPro()
 	{
 		return Auth::check() && Auth::user()->isPro();
diff --git a/app/routes.php b/app/routes.php
index e47bbeb06c47..61697eca6e07 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -22,30 +22,35 @@
 //dd(gethostname());
 //Log::error('test');
 
+if(Utils::isNinja()) {
+    Route::get('/', 'HomeController@showWelcome');
+    Route::get('/rocksteady', 'HomeController@showWelcome');
+    Route::get('/about', 'HomeController@showAboutUs');
+    Route::get('/terms', 'HomeController@showTerms');
+    Route::get('/contact', 'HomeController@showContactUs');
+    Route::get('/plans', 'HomeController@showPlans');
+    Route::post('/contact_submit', 'HomeController@doContactUs');
+    Route::get('/faq', 'HomeController@showFaq');
+    Route::get('/features', 'HomeController@showFeatures');
+    Route::get('/secure_payment', 'HomeController@showSecurePayment');
+    Route::get('/testimonials', 'HomeController@showTestimonials');
 
-Route::get('/', 'HomeController@showWelcome');
-Route::get('/rocksteady', 'HomeController@showWelcome');
-Route::get('/about', 'HomeController@showAboutUs');
-Route::get('/terms', 'HomeController@showTerms');
-Route::get('/contact', 'HomeController@showContactUs');
-Route::get('/plans', 'HomeController@showPlans');
-Route::post('/contact_submit', 'HomeController@doContactUs');
-Route::get('/faq', 'HomeController@showFaq');
-Route::get('/features', 'HomeController@showFeatures');
-Route::get('/secure_payment', 'HomeController@showSecurePayment');
-Route::get('/testimonials', 'HomeController@showTestimonials');
+    Route::get('log_error', 'HomeController@logError');
+    Route::get('invoice_now', 'HomeController@invoiceNow');
+    Route::post('get_started', 'AccountController@getStarted');
 
-Route::get('log_error', 'HomeController@logError');
-Route::get('invoice_now', 'HomeController@invoiceNow');
-Route::post('get_started', 'AccountController@getStarted');
+    Route::get('view/{invitation_key}', 'InvoiceController@view');
+    Route::get('payment/{invitation_key}', 'PaymentController@show_payment');
+    Route::post('payment/{invitation_key}', 'PaymentController@do_payment');
+    Route::get('complete', 'PaymentController@offsite_payment');
 
-Route::get('view/{invitation_key}', 'InvoiceController@view');
-Route::get('payment/{invitation_key}', 'PaymentController@show_payment');
-Route::post('payment/{invitation_key}', 'PaymentController@do_payment');
-Route::get('complete', 'PaymentController@offsite_payment');
-
-Route::post('signup/validate', 'AccountController@checkEmail');
-Route::post('signup/submit', 'AccountController@submitSignup');
+    Route::post('signup/validate', 'AccountController@checkEmail');
+    Route::post('signup/submit', 'AccountController@submitSignup');
+} else {
+    Route::get('/', function() {
+        return Redirect::to('dashboard');
+    });
+}
 
 // Confide routes
 Route::get('login', 'UserController@login');
@@ -60,7 +65,7 @@ Route::get('logout', 'UserController@logout');
 
 Route::group(array('before' => 'auth'), function()
 {   
-	Route::get('dashboard', 'DashboardController@index');
+  Route::get('dashboard', 'DashboardController@index');
   Route::get('view_archive/{entity_type}/{visible}', 'AccountController@setTrashVisible');
   Route::get('force_inline_pdf', 'UserController@forcePDFJS');