Fixed indent spacing
Added support for legacy system users, return old host if username doesn't contain @