Changing to in-edit and also merge password changing.