stas fix + username fix part 2