Changed code which handles swapped out auth.user model to prevent circular import