Bugfixes Login/Delivery