diff --git a/.gitignore b/.gitignore
index 92eabb3..a310fe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .bundle/
 log/*.log
 pkg/
+*.swp
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
diff --git a/app/controllers/cmtool/pages_controller.rb b/app/controllers/cmtool/pages_controller.rb
index f583af9..1125bfe 100644
--- a/app/controllers/cmtool/pages_controller.rb
+++ b/app/controllers/cmtool/pages_controller.rb
@@ -3,7 +3,7 @@ module Cmtool
     # GET /pages
     # GET /pages.xml
     def index
-      @pages = ::Page.all.sort_by{|p| "#{p.parent.presence.try(:reverse) || p.name}#{p.position.to_s.rjust(6, "0")}" }
+      #@pages = ::Page.all.sort_by{|p| "#{p.parent.presence.try(:reverse) || p.name}#{p.position.to_s.rjust(6, "0")}" }
 
       respond_to do |format|
         format.html # index.html.erb
diff --git a/lib/cmtool/includes/user.rb b/lib/cmtool/includes/user.rb
index 8c5451a..28d8502 100644
--- a/lib/cmtool/includes/user.rb
+++ b/lib/cmtool/includes/user.rb
@@ -15,7 +15,7 @@ module Cmtool
 
         #== VALIDATIONS
         klass.validates_presence_of :email
-        klass.validates_uniqueness_of :email
+        klass.validates_uniqueness_of :email, if: lambda{ |u| u.email.present? }
         klass.validates_presence_of :encrypted_password, if: lambda{ |u| u.email.present? }
         klass.validates_confirmation_of :password, if: lambda{ |u| u.password.present? }
     
diff --git a/spec/dummy/config/environments/.development.rb.swp b/spec/dummy/config/environments/.development.rb.swp
deleted file mode 100644
index e5ee5b3..0000000
Binary files a/spec/dummy/config/environments/.development.rb.swp and /dev/null differ
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 324914a..d61bb91 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -50,6 +50,14 @@ RSpec.configure do |config|
     fill_in 'user[password]', with: @user.password
     click_on 'Sign in'
   end
+
+  def create_pages_tree
+    root1 = Page.create(name: 'root1', locale: 'en')
+    root2 = Page.create(name: 'root2', locale: 'en')
+    child1_1 = Page.create( name: 'child1.1', locale: 'en', parent: root1 )
+    child2_1 = Page.create( name: 'child2.1', locale: 'en', parent: root2 )
+    child2_2 = Page.create( name: 'child2.2', locale: 'en', parent: root2 )
+  end
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: