diff --git a/lib/locomotive/routing/site_dispatcher.rb b/lib/locomotive/routing/site_dispatcher.rb
index c1e66ed2..b0c8d81c 100644
--- a/lib/locomotive/routing/site_dispatcher.rb
+++ b/lib/locomotive/routing/site_dispatcher.rb
@@ -38,11 +38,11 @@ module Locomotive
         end
 
         def validate_site_membership
-          unless current_site.present? && current_site.accounts.include?(current_admin)
-            sign_out(current_admin)
-            flash[:alert] = I18n.t(:no_membership, :scope => [:devise, :failure, :admin])
-            redirect_to new_admin_session_url
-          end
+          return true if current_site.present? && current_site.accounts.include?(current_admin)
+
+          sign_out(current_admin)
+          flash[:alert] = I18n.t(:no_membership, :scope => [:devise, :failure, :admin])
+          redirect_to new_admin_session_url and return false
         end
 
       end
diff --git a/spec/lib/locomotive/routing/site_dispatcher_spec.rb b/spec/lib/locomotive/routing/site_dispatcher_spec.rb
new file mode 100644
index 00000000..fcf26f97
--- /dev/null
+++ b/spec/lib/locomotive/routing/site_dispatcher_spec.rb
@@ -0,0 +1,247 @@
+require 'spec_helper'
+
+class MyController < ActionController::Base
+  include Locomotive::Routing::SiteDispatcher
+end
+
+describe Locomotive::Routing::SiteDispatcher do
+
+  before :each do
+    @controller = MyController.new
+  end
+
+  context 'inheriting the site dispatcher' do
+
+    before :each do
+      @controller = MyController.new
+    end
+
+    it 'adds a helper method for current site' do
+      @controller.should respond_to :current_site
+    end
+
+  end
+
+  describe '#fetch_site' do
+
+    before :each do
+      @request    = Object.new
+      @site       = Factory.build(:site)
+
+      @controller.stubs(:request).returns(@request)
+      @request.stubs(:host).returns('host')
+      @request.stubs(:env).returns({})
+    end
+
+    it 'returns the current site instance if available' do
+      @controller.instance_variable_set(:@current_site, @site)
+      @controller.send(:fetch_site).should == @site
+    end
+
+    it 'returns the site with matching domain if there is no current site instance' do
+      Site.expects(:match_domain).with('host').returns([@site])
+      @controller.send(:fetch_site).should == @site
+    end
+
+  end
+
+  describe '#current_site' do
+
+    before :each do
+      @site = Factory.build(:site)
+    end
+
+    it 'returns the current site instance if available' do
+      @controller.instance_variable_set(:@current_site, @site)
+      @controller.send(:current_site).should == @site
+    end
+
+    it 'runs fetch site if no instance is available' do
+      @controller.stubs(:fetch_site).returns(@site)
+      @controller.send(:current_site).should == @site
+    end
+
+  end
+
+  describe '#require_site' do
+
+    context 'when there is a current site' do
+
+      before :each do
+        @controller.expects(:current_site).returns(true)
+      end
+    
+      it 'returns true' do
+        @controller.send(:require_site).should be_true
+      end
+
+    end
+
+    context 'when there are no accounts' do
+
+      before :each do
+        Account.expects(:count).returns(0)
+
+        @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
+        @controller.expects(:current_site).returns(false)
+        @controller.stubs(:admin_installation_url).returns('/admin/install/url/')
+        @controller.stubs(:redirect_to).with('/admin/install/url/')
+      end
+    
+      it 'returns false' do
+        @controller.send(:require_site).should be_false
+      end
+
+      it 'redirects to the admin installation url' do
+        @controller.expects(:redirect_to).with('/admin/install/url/')
+        @controller.send(:require_site)
+      end
+
+    end
+    
+    context 'when there are no sites' do
+
+      before :each do
+        Account.expects(:count).returns(1)
+        Site.expects(:count).returns(0)
+
+        @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
+        @controller.expects(:current_site).returns(false)
+        @controller.stubs(:admin_installation_url).returns('/admin/install/url/')
+        @controller.stubs(:redirect_to).with('/admin/install/url/')
+      end
+    
+      it 'returns false' do
+        @controller.send(:require_site).should be_false
+      end
+
+      it 'redirects to the admin installation url' do
+        @controller.expects(:redirect_to).with('/admin/install/url/')
+        @controller.send(:require_site)
+      end
+
+    end
+
+    context 'when there is no current site' do
+
+      before :each do
+        Account.expects(:count).returns(1)
+        Site.expects(:count).returns(1)
+
+        @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
+        @controller.expects(:current_site).returns(false)
+      end
+    
+      it 'returns false' do
+        @controller.send(:require_site).should be_false
+      end
+
+      it 'renders the no site error' do
+        @controller.expects(:render_no_site_error)
+        @controller.send(:require_site)
+      end
+
+    end
+
+  end
+
+  describe '#render_no_site_error' do
+
+    it 'renders the no site template with no layout' do
+      @controller.expects(:render).with(:template => '/admin/errors/no_site', :layout => false)
+      @controller.send(:render_no_site_error)
+    end
+
+  end
+
+  describe '#validate_site_membership' do
+
+    before :each do
+      @account = Factory.build(:account)
+      @site    = Factory.build(:site)
+      @request = ActionDispatch::Request.new({})
+
+      @controller.instance_variable_set('@_response', ActionDispatch::Response.new)
+      @controller.stubs(:request).returns(@request)
+      @controller.stubs(:current_admin).returns(@account)
+      @controller.stubs(:sign_out).with(@account)
+      @controller.stubs(:new_admin_session_url).returns('/new/admin/session')
+    end
+
+    context 'when a site is present' do
+
+      before :each do
+        @controller.stubs(:current_site).returns(@site)
+      end
+
+      context 'and the user has a membership' do
+
+        before :each do
+          @site.stubs(:accounts).returns([@account])
+        end
+
+        it 'returns true' do
+          @controller.send(:validate_site_membership).should be_true
+        end
+
+      end
+
+      context 'and the user does not have a membership' do
+
+        before :each do
+          @site.stubs(:accounts).returns([])
+        end
+
+        it 'signs out the user' do
+          @controller.expects(:sign_out).with(@account)
+          @controller.send(:validate_site_membership)
+        end
+
+        it 'adds a flash message for no membership' do
+          @controller.send(:validate_site_membership)
+          @controller.flash[:alert].should be_present
+        end
+
+        it 'redirects to the new session url' do
+          @controller.expects(:redirect_to).with('/new/admin/session')
+          @controller.send(:validate_site_membership)
+        end
+
+        it 'returns false' do
+          @controller.send(:validate_site_membership).should be_false
+        end
+
+      end
+
+    end
+
+    context 'when no site is present' do
+
+      before :each do
+        @controller.stubs(:current_site).returns(nil)
+      end
+
+      it 'signs out the user' do
+        @controller.expects(:sign_out).with(@account)
+        @controller.send(:validate_site_membership)
+      end
+
+      it 'adds a flash message for no membership' do
+        @controller.send(:validate_site_membership)
+        @controller.flash[:alert].should be_present
+      end
+
+      it 'redirects to the new session url' do
+        @controller.expects(:redirect_to).with('/new/admin/session')
+        @controller.send(:validate_site_membership)
+      end
+
+      it 'returns false' do
+        @controller.send(:validate_site_membership).should be_false
+      end
+
+    end
+
+  end
+
+end