Edit to make work with swapped user model