Reformatted conversations#show and put password back into users#edit