bugfix: rematch now working properly
Bugfix: Username stays now