Fixed username/host mix up...really need to write tests