Reverting duplicate username code for the moment to resolve setup issues.