Allow username to be different from environment