Fix sign out link and vet field in form
Resolve merge conflict