Fixed username and currency handling