Hotfix

Created by: StephanMa

Hotfixes for #549 (closed) #550 (closed)

Tested on dev

Fix for #549 (closed) was manually activated on the live server to prevent further server issues until next PR-Enrollment

---

This change is