Updated to work with latest spree_auth_devise. May need to make more generic?