diff --git a/spec/factories.rb b/spec/factories.rb
index e417cd1e..12ec55bb 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -7,7 +7,6 @@
     after(:build) do |user, options|
       # a current company is required for the user to be valid
       # unless one is already set, create one
-      next if user.email_validation_pending?
       next if user.current_company.present?
 
       if user.memberships.length == 1
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 75c4317a..421773ca 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,22 +2,12 @@
 
 RSpec.describe User, type: :model do
   context "validations" do
-    context "when user has a validated email address" do
-      it "requires a current company" do
-        user = build(:user)
-        user.update(current_company: nil)
-        expect(user).to_not be_valid
-      end
-    end
-
-    context "when user does not have a validated email address" do
-      it "does not require a current company" do
-        user = build(:user, :needs_validation)
-        user.update(current_company: nil, current_company_id: nil)
-        expect(user).to_not be_valid
-      end
+    it "requires a current company" do
+      user = build(:user)
+      user.update(current_company: nil)
+      expect(user).to_not be_valid
     end
-
+    
     it "requires a unique email" do
       user = create(:membership).user
       other_user = build(:membership, user: build(:user, email: user.email)).user