Per issue #50; Accomodate Username Changes