Fixes

Fixed multi-username support