diff --git a/app/controllers/concerns/accounts.rb b/app/controllers/concerns/accounts.rb
index 18fbc20..aa17b43 100644
--- a/app/controllers/concerns/accounts.rb
+++ b/app/controllers/concerns/accounts.rb
@@ -3,7 +3,7 @@ module Accounts
 
   included do
     helper_method :current_account, :personal_account, :onboarded?
-    before_action :redirect_to_onboarding
+    before_action :redirect_to_onboarding, unless: :devise_controller?
   end
 
   def current_account
diff --git a/app/models/user.rb b/app/models/user.rb
index ce2d522..36d52bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -10,6 +10,6 @@ class User < ApplicationRecord
   validates_associated :personal_account
 
   def onboarded?
-    personal_account.present?
+    personal_account.present? && personal_account.persisted?
   end
 end