Fixed a couple of minor problems with changing user names.