Fixed username handling. '@' removal was not implemented correctly.