Fix correct_user for guest links and edit links show
Merge conflict