Bug fixes

- Fix crash with <name>
- Crop host from username