User Handling verbessert