Add guest name form for guests.
Fix merge conflict in remotes controller.