We can handle this outside of this PR; however, we probably will no longer need 'username'.  Instead, we'll modify the engine to use 'login' from the foreman core.