Adjust get_or_create so it works
Better handling of the redirect